Merge #1482

bors[bot] · kjeremy · bors[bot] · commit b1bf434dfcf8 · 2019-07-04T21:56:36.000Z
1482: Some clippy fixes for 1.36 r=kjeremy a=kjeremy Some clippy fixes now that 1.36 is released. ~~Plus the requisite format run (I can rebase after #1481 is merged to make this cleaner) .~~ The change from `map(|it| *it)` to `copied()` changes the minimum rust stable to 1.36. Co-authored-by: Jeremy Kolb <kjeremy@gmail.com>
diff --git a/crates/gen_lsp_server/src/lib.rs b/crates/gen_lsp_server/src/lib.rs
@@ -130,7 +130,7 @@ fn initialize(
         Ok(RawMessage::Notification(n)) => {
             n.cast::<Initialized>().map_err(|_| "expected initialized notification")?;
         }
-        _ => Err(format!("expected initialized notification"))?,
+        _ => Err("expected initialized notification".to_string())?,
     }
     Ok(params)
 }
diff --git a/crates/ra_assists/src/auto_import.rs b/crates/ra_assists/src/auto_import.rs
@@ -39,13 +39,13 @@ fn collect_path_segments_raw<'a>(
     // We need to reverse only the new added segments
     let only_new_segments = segments.split_at_mut(oldlen).1;
     only_new_segments.reverse();
-    return Some(segments.len() - oldlen);
+    Some(segments.len() - oldlen)
 }
 
 fn fmt_segments(segments: &[SmolStr]) -> String {
     let mut buf = String::new();
     fmt_segments_raw(segments, &mut buf);
-    return buf;
+    buf
 }
 
 fn fmt_segments_raw(segments: &[SmolStr], buf: &mut String) {
@@ -61,7 +61,7 @@ fn fmt_segments_raw(segments: &[SmolStr], buf: &mut String) {
 
 // Returns the numeber of common segments.
 fn compare_path_segments(left: &[SmolStr], right: &[&ast::PathSegment]) -> usize {
-    return left.iter().zip(right).filter(|(l, r)| compare_path_segment(l, r)).count();
+    left.iter().zip(right).filter(|(l, r)| compare_path_segment(l, r)).count()
 }
 
 fn compare_path_segment(a: &SmolStr, b: &ast::PathSegment) -> bool {
@@ -320,7 +320,7 @@ fn walk_use_tree_for_best_action<'a>(
 
     // We remove the segments added
     current_path_segments.truncate(prev_len);
-    return action;
+    action
 }
 
 fn best_action_for_target<'b, 'a: 'b>(
@@ -339,7 +339,7 @@ fn best_action_for_target<'b, 'a: 'b>(
         });
 
     match best_action {
-        Some(action) => return action,
+        Some(action) => action,
         None => {
             // We have no action and no UseItem was found in container so we find
             // another item and we use it as anchor.
@@ -350,7 +350,7 @@ fn best_action_for_target<'b, 'a: 'b>(
                 .find(|n| n.range().start() < anchor.range().start())
                 .or_else(|| Some(anchor));
 
-            return ImportAction::add_new_use(anchor, false);
+            ImportAction::add_new_use(anchor, false)
         }
     }
 }
diff --git a/crates/ra_cli/src/main.rs b/crates/ra_cli/src/main.rs
@@ -112,6 +112,6 @@ fn read_stdin() -> Result<String> {
 }
 
 fn rsplit_at_char(s: &str, c: char) -> Result<(&str, &str)> {
-    let idx = s.rfind(":").ok_or_else(|| format!("no `{}` in {}", c, s))?;
+    let idx = s.rfind(':').ok_or_else(|| format!("no `{}` in {}", c, s))?;
     Ok((&s[..idx], &s[idx + 1..]))
 }
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
@@ -139,7 +139,7 @@ impl CrateGraph {
     }
 
     pub fn iter<'a>(&'a self) -> impl Iterator<Item = CrateId> + 'a {
-        self.arena.keys().map(|it| *it)
+        self.arena.keys().copied()
     }
 
     pub fn crate_root(&self, crate_id: CrateId) -> FileId {
@@ -191,7 +191,7 @@ impl CrateGraph {
                 return true;
             }
         }
-        return false;
+        false
     }
 }
 
diff --git a/crates/ra_hir/src/code_model/docs.rs b/crates/ra_hir/src/code_model/docs.rs
@@ -74,7 +74,7 @@ pub(crate) fn documentation_query(
         DocDef::Module(it) => docs_from_ast(&*it.declaration_source(db)?.ast),
         DocDef::StructField(it) => match it.source(db).ast {
             FieldSource::Named(named) => docs_from_ast(&*named),
-            FieldSource::Pos(..) => return None,
+            FieldSource::Pos(..) => None,
         },
         DocDef::Struct(it) => docs_from_ast(&*it.source(db).ast),
         DocDef::Enum(it) => docs_from_ast(&*it.source(db).ast),
diff --git a/crates/ra_hir/src/expr.rs b/crates/ra_hir/src/expr.rs
@@ -150,7 +150,7 @@ impl BodySourceMap {
     }
 
     pub(crate) fn field_syntax(&self, expr: ExprId, field: usize) -> AstPtr<ast::NamedField> {
-        self.field_map[&(expr, field)].clone()
+        self.field_map[&(expr, field)]
     }
 }
 
@@ -471,15 +471,15 @@ impl Pat {
         match self {
             Pat::Range { .. } | Pat::Lit(..) | Pat::Path(..) | Pat::Wild | Pat::Missing => {}
             Pat::Bind { subpat, .. } => {
-                subpat.iter().map(|pat| *pat).for_each(f);
+                subpat.iter().copied().for_each(f);
             }
             Pat::Tuple(args) | Pat::TupleStruct { args, .. } => {
-                args.iter().map(|pat| *pat).for_each(f);
+                args.iter().copied().for_each(f);
             }
             Pat::Ref { pat, .. } => f(*pat),
             Pat::Slice { prefix, rest, suffix } => {
                 let total_iter = prefix.iter().chain(rest.iter()).chain(suffix.iter());
-                total_iter.map(|pat| *pat).for_each(f);
+                total_iter.copied().for_each(f);
             }
             Pat::Struct { args, .. } => {
                 args.iter().map(|f| f.pat).for_each(f);
diff --git a/crates/ra_hir/src/expr/scope.rs b/crates/ra_hir/src/expr/scope.rs
@@ -72,7 +72,7 @@ impl ExprScopes {
     }
 
     pub(crate) fn scope_for(&self, expr: ExprId) -> Option<ScopeId> {
-        self.scope_by_expr.get(&expr).map(|&scope| scope)
+        self.scope_by_expr.get(&expr).copied()
     }
 
     pub(crate) fn scope_by_expr(&self) -> &FxHashMap<ExprId, ScopeId> {
diff --git a/crates/ra_hir/src/lang_item.rs b/crates/ra_hir/src/lang_item.rs
@@ -122,7 +122,7 @@ impl LangItems {
         module: Module,
     ) {
         if let Some(module_lang_items) = db.module_lang_items(module) {
-            self.items.extend(module_lang_items.items.iter().map(|(k, v)| (k.clone(), v.clone())))
+            self.items.extend(module_lang_items.items.iter().map(|(k, v)| (k.clone(), *v)))
         }
 
         // Look for lang items in the children
@@ -142,7 +142,7 @@ impl LangItems {
     {
         let node = item.source(db).ast;
         if let Some(lang_item_name) = lang_item_name(&*node) {
-            self.items.entry(lang_item_name).or_insert(constructor(item));
+            self.items.entry(lang_item_name).or_insert_with(|| constructor(item));
         }
     }
 }
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
@@ -76,7 +76,7 @@ impl MockDatabase {
 
     pub fn diagnostics(&self) -> String {
         let mut buf = String::from("\n");
-        let mut files: Vec<FileId> = self.files.values().map(|&it| it).collect();
+        let mut files: Vec<FileId> = self.files.values().copied().collect();
         files.sort();
         for file in files {
             let module = crate::source_binder::module_from_file_id(self, file).unwrap();
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs
@@ -227,10 +227,8 @@ where
                             .items
                             .iter()
                             .map(|(name, res)| (name.clone(), Either::A(res.clone())));
-                        let macros = scope
-                            .macros
-                            .iter()
-                            .map(|(name, res)| (name.clone(), Either::B(res.clone())));
+                        let macros =
+                            scope.macros.iter().map(|(name, res)| (name.clone(), Either::B(*res)));
 
                         let all = items.chain(macros).collect::<Vec<_>>();
                         self.update(module_id, Some(import_id), &all);
@@ -243,10 +241,8 @@ where
                             .items
                             .iter()
                             .map(|(name, res)| (name.clone(), Either::A(res.clone())));
-                        let macros = scope
-                            .macros
-                            .iter()
-                            .map(|(name, res)| (name.clone(), Either::B(res.clone())));
+                        let macros =
+                            scope.macros.iter().map(|(name, res)| (name.clone(), Either::B(*res)));
 
                         let all = items.chain(macros).collect::<Vec<_>>();
 
@@ -651,7 +647,7 @@ fn resolve_submodule(
         candidates.push(file_dir_mod.clone());
     };
     let sr = db.source_root(source_root_id);
-    let mut points_to = candidates.into_iter().filter_map(|path| sr.files.get(&path)).map(|&it| it);
+    let mut points_to = candidates.into_iter().filter_map(|path| sr.files.get(&path)).copied();
     // FIXME: handle ambiguity
     match points_to.next() {
         Some(file_id) => Ok(file_id),
diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs
@@ -272,7 +272,7 @@ impl Scope {
             },
             Scope::ImplBlockScope(i) => {
                 if name.as_known_name() == Some(KnownName::SelfType) {
-                    PerNs::types(Resolution::SelfType(i.clone()))
+                    PerNs::types(Resolution::SelfType(*i))
                 } else {
                     PerNs::none()
                 }
@@ -317,7 +317,7 @@ impl Scope {
                 }
             }
             Scope::ImplBlockScope(i) => {
-                f(Name::self_type(), PerNs::types(Resolution::SelfType(i.clone())));
+                f(Name::self_type(), PerNs::types(Resolution::SelfType(*i)));
             }
             Scope::ExprScope(e) => {
                 e.expr_scopes.entries(e.scope_id).iter().for_each(|e| {
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
@@ -116,16 +116,16 @@ pub struct InferenceResult {
 
 impl InferenceResult {
     pub fn method_resolution(&self, expr: ExprId) -> Option<Function> {
-        self.method_resolutions.get(&expr).map(|it| *it)
+        self.method_resolutions.get(&expr).copied()
     }
     pub fn field_resolution(&self, expr: ExprId) -> Option<StructField> {
-        self.field_resolutions.get(&expr).map(|it| *it)
+        self.field_resolutions.get(&expr).copied()
     }
     pub fn assoc_resolutions_for_expr(&self, id: ExprId) -> Option<ImplItem> {
-        self.assoc_resolutions.get(&id.into()).map(|it| *it)
+        self.assoc_resolutions.get(&id.into()).copied()
     }
     pub fn assoc_resolutions_for_pat(&self, id: PatId) -> Option<ImplItem> {
-        self.assoc_resolutions.get(&id.into()).map(|it| *it)
+        self.assoc_resolutions.get(&id.into()).copied()
     }
     pub(crate) fn add_diagnostics(
         &self,
@@ -239,8 +239,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
             &self.resolver,
             type_ref,
         );
-        let ty = self.insert_type_vars(ty);
-        ty
+        self.insert_type_vars(ty)
     }
 
     fn unify_substs(&mut self, substs1: &Substs, substs2: &Substs, depth: usize) -> bool {
@@ -973,8 +972,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
 
                 for (arg_pat, arg_type) in args.iter().zip(arg_types.iter()) {
                     let expected = if let Some(type_ref) = arg_type {
-                        let ty = self.make_ty(type_ref);
-                        ty
+                        self.make_ty(type_ref)
                     } else {
                         Ty::Unknown
                     };
diff --git a/crates/ra_hir/src/ty/infer/unify.rs b/crates/ra_hir/src/ty/infer/unify.rs
@@ -102,7 +102,7 @@ impl<T> Canonicalized<T> {
         ty.fold(&mut |ty| match ty {
             Ty::Bound(idx) => {
                 if (idx as usize) < self.free_vars.len() {
-                    Ty::Infer(self.free_vars[idx as usize].clone())
+                    Ty::Infer(self.free_vars[idx as usize])
                 } else {
                     Ty::Bound(idx)
                 }
@@ -120,7 +120,7 @@ impl<T> Canonicalized<T> {
         let new_vars =
             (0..solution.num_vars).map(|_| ctx.new_type_var()).collect::<Vec<_>>().into();
         for (i, ty) in solution.value.into_iter().enumerate() {
-            let var = self.free_vars[i].clone();
+            let var = self.free_vars[i];
             ctx.unify(&Ty::Infer(var), &ty.subst_bound_vars(&new_vars));
         }
     }
diff --git a/crates/ra_ide_api/src/db.rs b/crates/ra_ide_api/src/db.rs
@@ -72,8 +72,8 @@ impl salsa::ParallelDatabase for RootDatabase {
     fn snapshot(&self) -> salsa::Snapshot<RootDatabase> {
         salsa::Snapshot::new(RootDatabase {
             runtime: self.runtime.snapshot(self),
-            last_gc: self.last_gc.clone(),
-            last_gc_check: self.last_gc_check.clone(),
+            last_gc: self.last_gc,
+            last_gc_check: self.last_gc_check,
         })
     }
 }
diff --git a/crates/ra_ide_api/src/display/structure.rs b/crates/ra_ide_api/src/display/structure.rs
@@ -25,7 +25,7 @@ pub fn file_structure(file: &SourceFile) -> Vec<StructureNode> {
         match event {
             WalkEvent::Enter(node) => {
                 if let Some(mut symbol) = structure_node(node) {
-                    symbol.parent = stack.last().map(|&n| n);
+                    symbol.parent = stack.last().copied();
                     stack.push(res.len());
                     res.push(symbol);
                 }
diff --git a/crates/ra_ide_api/src/line_index_utils.rs b/crates/ra_ide_api/src/line_index_utils.rs
@@ -137,7 +137,7 @@ impl<'a> Edits<'a> {
             Step::Newline(n) => n,
             Step::Utf16Char(r) => r.end(),
         };
-        let res = match &mut self.current {
+        match &mut self.current {
             Some(edit) => {
                 if step_pos <= edit.delete.start() {
                     NextSteps::Use
@@ -155,8 +155,7 @@ impl<'a> Edits<'a> {
                 }
             }
             None => NextSteps::Use,
-        };
-        res
+        }
     }
 
     fn translate_range(&self, range: TextRange) -> TextRange {
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs
@@ -87,7 +87,7 @@ pub(crate) fn world_symbols(db: &RootDatabase, query: Query) -> Vec<FileSymbol>
         let mut files = Vec::new();
         for &root in db.local_roots().iter() {
             let sr = db.source_root(root);
-            files.extend(sr.files.values().map(|&it| it))
+            files.extend(sr.files.values().copied())
         }
 
         let snap = Snap(db.snapshot());
diff --git a/crates/ra_lsp_server/src/conv.rs b/crates/ra_lsp_server/src/conv.rs
@@ -171,7 +171,7 @@ impl Conv for ra_ide_api::Documentation {
     fn conv(self) -> Documentation {
         Documentation::MarkupContent(MarkupContent {
             kind: MarkupKind::Markdown,
-            value: crate::markdown::mark_fenced_blocks_as_rust(self.as_str()).into(),
+            value: crate::markdown::mark_fenced_blocks_as_rust(self.as_str()),
         })
     }
 }
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs
@@ -398,7 +398,8 @@ fn on_notification(
         Ok(mut params) => {
             let uri = params.text_document.uri;
             let path = uri.to_file_path().map_err(|()| format!("invalid uri: {}", uri))?;
-            let text = params.content_changes.pop().ok_or_else(|| format!("empty changes"))?.text;
+            let text =
+                params.content_changes.pop().ok_or_else(|| "empty changes".to_string())?.text;
             state.vfs.write().change_file_overlay(path.as_path(), text);
             return Ok(());
         }
diff --git a/crates/ra_mbe/src/mbe_expander.rs b/crates/ra_mbe/src/mbe_expander.rs
@@ -498,7 +498,7 @@ fn expand_tt(
                 tt::Leaf::from(tt::Ident { text: ident.text.clone(), id: TokenId::unspecified() })
                     .into()
             }
-            crate::Leaf::Punct(punct) => tt::Leaf::from(punct.clone()).into(),
+            crate::Leaf::Punct(punct) => tt::Leaf::from(*punct).into(),
             crate::Leaf::Var(v) => {
                 if v.text == "crate" {
                     // FIXME: Properly handle $crate token
diff --git a/crates/ra_mbe/src/mbe_parser.rs b/crates/ra_mbe/src/mbe_parser.rs
@@ -56,7 +56,7 @@ fn parse_subtree(tt: &tt::Subtree, transcriber: bool) -> Result<crate::Subtree,
                     }
                 }
                 tt::Leaf::Punct(punct) => crate::Leaf::from(*punct).into(),
-                tt::Leaf::Ident(tt::Ident { text, id: _ }) => {
+                tt::Leaf::Ident(tt::Ident { text, .. }) => {
                     crate::Leaf::from(crate::Ident { text: text.clone() }).into()
                 }
                 tt::Leaf::Literal(tt::Literal { text }) => {
diff --git a/crates/ra_mbe/src/subtree_source.rs b/crates/ra_mbe/src/subtree_source.rs
@@ -78,7 +78,7 @@ impl<'a> SubtreeTokenSource<'a> {
             }
         }
 
-        return cached[pos].clone();
+        cached[pos].clone()
     }
 }
 
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs
@@ -107,7 +107,7 @@ pub fn token_tree_to_ast_item_list(tt: &tt::Subtree) -> TreeArc<ast::SourceFile>
 impl TokenMap {
     pub fn relative_range_of(&self, tt: tt::TokenId) -> Option<TextRange> {
         let idx = tt.0 as usize;
-        self.tokens.get(idx).map(|&it| it)
+        self.tokens.get(idx).copied()
     }
 
     fn alloc(&mut self, relative_range: TextRange) -> tt::TokenId {
diff --git a/crates/ra_mbe/src/tt_cursor.rs b/crates/ra_mbe/src/tt_cursor.rs
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
diff --git a/crates/ra_syntax/src/ast/expr_extensions.rs b/crates/ra_syntax/src/ast/expr_extensions.rs
diff --git a/crates/ra_syntax/src/fuzz.rs b/crates/ra_syntax/src/fuzz.rs
diff --git a/crates/ra_syntax/src/parsing/text_token_source.rs b/crates/ra_syntax/src/parsing/text_token_source.rs
diff --git a/crates/ra_syntax/src/syntax_node.rs b/crates/ra_syntax/src/syntax_node.rs
diff --git a/crates/ra_syntax/src/validation/unescape.rs b/crates/ra_syntax/src/validation/unescape.rs

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ fn initialize(`
`130`	`130`	`Ok(RawMessage::Notification(n)) => {`
`131`	`131`	`n.cast::<Initialized>().map_err(\|_\| "expected initialized notification")?;`
`132`	`132`	`}`
`133`		`- _ => Err(format!("expected initialized notification"))?,`
	`133`	`+ _ => Err("expected initialized notification".to_string())?,`
`134`	`134`	`}`
`135`	`135`	`Ok(params)`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,6 @@ fn read_stdin() -> Result<String> {`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`fn rsplit_at_char(s: &str, c: char) -> Result<(&str, &str)> {`
`115`		- let idx = s.rfind(":").ok_or_else(\|\| format!("no `{}` in {}", c, s))?;
	`115`	+ let idx = s.rfind(':').ok_or_else(\|\| format!("no `{}` in {}", c, s))?;
`116`	`116`	`Ok((&s[..idx], &s[idx + 1..]))`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ impl CrateGraph {`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`pub fn iter<'a>(&'a self) -> impl Iterator<Item = CrateId> + 'a {`
`142`		`- self.arena.keys().map(\|it\| *it)`
	`142`	`+ self.arena.keys().copied()`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`pub fn crate_root(&self, crate_id: CrateId) -> FileId {`
`@@ -191,7 +191,7 @@ impl CrateGraph {`
`191`	`191`	`return true;`
`192`	`192`	`}`
`193`	`193`	`}`
`194`		`- return false;`
	`194`	`+ false`
`195`	`195`	`}`
`196`	`196`	`}`
`197`	`197`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ impl BodySourceMap {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`pub(crate) fn field_syntax(&self, expr: ExprId, field: usize) -> AstPtr<ast::NamedField> {`
`153`		`- self.field_map[&(expr, field)].clone()`
	`153`	`+ self.field_map[&(expr, field)]`
`154`	`154`	`}`
`155`	`155`	`}`
`156`	`156`
`@@ -471,15 +471,15 @@ impl Pat {`
`471`	`471`	`match self {`
`472`	`472`	`Pat::Range { .. } \| Pat::Lit(..) \| Pat::Path(..) \| Pat::Wild \| Pat::Missing => {}`
`473`	`473`	`Pat::Bind { subpat, .. } => {`
`474`		`- subpat.iter().map(\|pat\| *pat).for_each(f);`
	`474`	`+ subpat.iter().copied().for_each(f);`
`475`	`475`	`}`
`476`	`476`	`Pat::Tuple(args) \| Pat::TupleStruct { args, .. } => {`
`477`		`- args.iter().map(\|pat\| *pat).for_each(f);`
	`477`	`+ args.iter().copied().for_each(f);`
`478`	`478`	`}`
`479`	`479`	`Pat::Ref { pat, .. } => f(*pat),`
`480`	`480`	`Pat::Slice { prefix, rest, suffix } => {`
`481`	`481`	`let total_iter = prefix.iter().chain(rest.iter()).chain(suffix.iter());`
`482`		`- total_iter.map(\|pat\| *pat).for_each(f);`
	`482`	`+ total_iter.copied().for_each(f);`
`483`	`483`	`}`
`484`	`484`	`Pat::Struct { args, .. } => {`
`485`	`485`	`args.iter().map(\|f\| f.pat).for_each(f);`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ impl ExprScopes {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`pub(crate) fn scope_for(&self, expr: ExprId) -> Option<ScopeId> {`
`75`		`- self.scope_by_expr.get(&expr).map(\|&scope\| scope)`
	`75`	`+ self.scope_by_expr.get(&expr).copied()`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`pub(crate) fn scope_by_expr(&self) -> &FxHashMap<ExprId, ScopeId> {`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ impl LangItems {`
`122`	`122`	`module: Module,`
`123`	`123`	`) {`
`124`	`124`	`if let Some(module_lang_items) = db.module_lang_items(module) {`
`125`		`- self.items.extend(module_lang_items.items.iter().map(\|(k, v)\| (k.clone(), v.clone())))`
	`125`	`+ self.items.extend(module_lang_items.items.iter().map(\|(k, v)\| (k.clone(), *v)))`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// Look for lang items in the children`
`@@ -142,7 +142,7 @@ impl LangItems {`
`142`	`142`	`{`
`143`	`143`	`let node = item.source(db).ast;`
`144`	`144`	`if let Some(lang_item_name) = lang_item_name(&*node) {`
`145`		`- self.items.entry(lang_item_name).or_insert(constructor(item));`
	`145`	`+ self.items.entry(lang_item_name).or_insert_with(\|\| constructor(item));`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`}`