Merge #2729

bors[bot] · michalt · web-flow · commit 1cb8aa131166 · 2020-01-03T11:43:41.000Z
2729: Remove a duplicate line in `collect_defs` r=matklad a=michalt



Co-authored-by: Michal Terepeta &lt;michal.terepeta@gmail.com&gt;
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
@@ -45,7 +45,6 @@ pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> C
         // If the dependency defines a prelude, we overwrite an already defined
         // prelude. This is necessary to import the "std" prelude if a crate
         // depends on both "core" and "std".
-        let dep_def_map = db.crate_def_map(dep.crate_id);
         if dep_def_map.prelude.is_some() {
             def_map.prelude = dep_def_map.prelude;
         }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ pub(super) fn collect_defs(db: &impl DefDatabase, mut def_map: CrateDefMap) -> C`
`45`	`45`	`// If the dependency defines a prelude, we overwrite an already defined`
`46`	`46`	`// prelude. This is necessary to import the "std" prelude if a crate`
`47`	`47`	`// depends on both "core" and "std".`
`48`		`- let dep_def_map = db.crate_def_map(dep.crate_id);`
`49`	`48`	`if dep_def_map.prelude.is_some() {`
`50`	`49`	`def_map.prelude = dep_def_map.prelude;`
`51`	`50`	`}`