Skip to content

Commit 139bf9b

Browse files
committed
Use array into_iter in more places
1 parent 71f5dae commit 139bf9b

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

crates/ide/src/doc_links/intra_doc_links.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ pub(super) fn parse_intra_doc_link(s: &str) -> (&str, Option<hir::Namespace>) {
2121
(hir::Namespace::Values, (VALUES.0.iter(), VALUES.1.iter())),
2222
(hir::Namespace::Macros, (MACROS.0.iter(), MACROS.1.iter())),
2323
]
24-
.iter()
25-
.cloned()
24+
.into_iter()
2625
.find_map(|(ns, (mut prefixes, mut suffixes))| {
2726
if let Some(prefix) = prefixes.find(|&&prefix| {
2827
s.starts_with(prefix)
@@ -42,8 +41,7 @@ pub(super) fn strip_prefixes_suffixes(s: &str) -> &str {
4241
(VALUES.0.iter(), VALUES.1.iter()),
4342
(MACROS.0.iter(), MACROS.1.iter()),
4443
]
45-
.iter()
46-
.cloned()
44+
.into_iter()
4745
.find_map(|(mut prefixes, mut suffixes)| {
4846
if let Some(prefix) = prefixes.find(|&&prefix| {
4947
s.starts_with(prefix)

crates/ide_assists/src/handlers/expand_glob_import.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ fn find_imported_defs(ctx: &AssistContext, star: SyntaxToken) -> Option<Vec<Def>
226226

227227
Some(
228228
[Direction::Prev, Direction::Next]
229-
.iter()
229+
.into_iter()
230230
.flat_map(|dir| {
231231
parent_use_item_syntax
232232
.siblings(dir.to_owned())

crates/ide_db/src/tests/sourcegen_lints.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn generate_lint_descriptor(buf: &mut String) {
105105

106106
fn generate_feature_descriptor(buf: &mut String, src_dir: &Path) {
107107
let mut features = ["language-features", "library-features"]
108-
.iter()
108+
.into_iter()
109109
.flat_map(|it| sourcegen::list_files(&src_dir.join(it)))
110110
.filter(|path| {
111111
// Get all `.md ` files

crates/project_model/src/sysroot.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ impl Sysroot {
4343
// core is added as a dependency before std in order to
4444
// mimic rustcs dependency order
4545
["core", "alloc", "std"]
46-
.iter()
47-
.copied()
46+
.into_iter()
4847
.zip(iter::repeat(true))
4948
.chain(iter::once(("test", false)))
5049
.filter_map(move |(name, prelude)| Some((name, self.by_name(name)?, prelude)))
@@ -78,7 +77,7 @@ impl Sysroot {
7877
for path in SYSROOT_CRATES.trim().lines() {
7978
let name = path.split('/').last().unwrap();
8079
let root = [format!("{}/src/lib.rs", path), format!("lib{}/lib.rs", path)]
81-
.iter()
80+
.into_iter()
8281
.map(|it| sysroot.root.join(it))
8382
.filter_map(|it| ManifestPath::try_from(it).ok())
8483
.find(|it| fs::metadata(it).is_ok());

crates/rust-analyzer/tests/slow-tests/support.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@ impl Server {
212212
if req.method == "client/registerCapability" {
213213
let params = req.params.to_string();
214214
if ["workspace/didChangeWatchedFiles", "textDocument/didSave"]
215-
.iter()
216-
.any(|&it| params.contains(it))
215+
.into_iter()
216+
.any(|it| params.contains(it))
217217
{
218218
continue;
219219
}

0 commit comments

Comments
 (0)