diff --git a/Cargo.lock b/Cargo.lock index d23cd59..b2006cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -579,7 +579,7 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "sever" -version = "1.0.0" +version = "1.0.1" dependencies = [ "cfg-if", "color-eyre", diff --git a/Cargo.toml b/Cargo.toml index 1a920b2..6f60c78 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sever" description = "Coerce hardlinks into new files" -version = "1.0.0" +version = "1.0.1" authors = ["Avril "] edition = "2018" readme = "README.org" diff --git a/src/main.rs b/src/main.rs index d25b203..c7d8886 100644 --- a/src/main.rs +++ b/src/main.rs @@ -71,7 +71,7 @@ async fn main() -> eyre::Result<()> { .dedup()) .filter_map(|file| { async move { - Some(parallel::expand_dir(file).await) + Some(parallel::expand_dir(file).await) //TODO: We gotta in here, too } }).flatten()).await, "Jobs failed") diff --git a/src/parallel.rs b/src/parallel.rs index 918438c..9cf1000 100644 --- a/src/parallel.rs +++ b/src/parallel.rs @@ -98,7 +98,7 @@ async fn join_stream(stream: I) -> impl Iterator>().await.into_iter() + join_all(stream.collect::>().await.into_iter()).await.into_iter() //TODO: We need to de-dupe this } pub async fn main>(list: I) -> eyre::Result<()> @@ -213,7 +213,7 @@ pub async fn expand_dir(p: String) -> impl Stream tx.send(p).await.unwrap(); } }); - rx + rx //TODO: map this to dedup } else { stream::iter(iter::once(p).filter_map(|p| { if Path::new(&p).is_dir() {