diff options
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | crates/ide_assists/src/handlers/extract_function.rs | 2 | ||||
| -rw-r--r-- | crates/ide_assists/src/handlers/unmerge_use.rs | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index 92f98b536ca..b777fcd8067 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -758,9 +758,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ "either", ] @@ -809,9 +809,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.108" +version = "0.2.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" +checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01" [[package]] name = "libloading" @@ -1127,9 +1127,9 @@ checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" dependencies = [ "unicode-xid", ] @@ -1226,9 +1226,9 @@ dependencies = [ [[package]] name = "pulldown-cmark-to-cmark" -version = "7.1.0" +version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d85e607de0249c2b5041e38de8684b00b62a64edee60bfcd85c153031a9d658" +checksum = "8bc14bc6b9f5881f240f9766414707ab24f972bcc3388589fe15b22fb15dc60d" dependencies = [ "pulldown-cmark", ] diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs index e2845bc58b6..63b0a91ce5a 100644 --- a/crates/ide_assists/src/handlers/extract_function.rs +++ b/crates/ide_assists/src/handlers/extract_function.rs @@ -480,7 +480,7 @@ impl FunctionBody { .statements() .map(|stmt| stmt.syntax().text_range()) .filter(|&stmt| selected.intersect(stmt).filter(|it| !it.is_empty()).is_some()) - .fold1(|acc, stmt| acc.cover(stmt)); + .reduce(|acc, stmt| acc.cover(stmt)); if let Some(tail_range) = parent .tail_expr() .map(|it| it.syntax().text_range()) diff --git a/crates/ide_assists/src/handlers/unmerge_use.rs b/crates/ide_assists/src/handlers/unmerge_use.rs index 71a816e19f6..7d73632c799 100644 --- a/crates/ide_assists/src/handlers/unmerge_use.rs +++ b/crates/ide_assists/src/handlers/unmerge_use.rs @@ -1,4 +1,3 @@ -use itertools::Itertools; use syntax::{ ast::{self, make, HasVisibility}, ted::{self, Position}, @@ -70,7 +69,7 @@ fn resolve_full_path(tree: &ast::UseTree) -> Option<ast::Path> { .filter_map(ast::UseTree::cast) .filter_map(|t| t.path()); - let final_path = paths.fold1(|prev, next| make::path_concat(next, prev))?; + let final_path = paths.reduce(|prev, next| make::path_concat(next, prev))?; if final_path.segment().map_or(false, |it| it.self_token().is_some()) { final_path.qualifier() } else { |