Martin von Zweigbergk 24b706641f async: switch to pollster's block_on() ... During the transition to using more async code, I keep running into https://github.com/rust-lang/futures-rs/issues/2090. Right now, I want to convert `MergedTree::diff()` into a `Stream`. I don't want to update all call sites at once, so instead I'm adding a `MergedTree::diff_stream()` method, which just wraps `MergedTree::diff()` in a `Stream. However, since the iterator is synchronous, it needs to block on the async `Backend::read_tree()` calls. If we then also block on the `Stream` in the CLI, we run into the panic.		2023-11-03 08:15:10 -07:00
..
examples	backend: make read_conflict synchronous again	2023-10-28 16:45:40 -07:00
src	async: switch to pollster's block_on()	2023-11-03 08:15:10 -07:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	git_backend: replace git2::Repository with gix::Repository	2023-11-02 19:33:06 +09:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	async: switch to pollster's block_on()	2023-11-03 08:15:10 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00