aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-01-03 11:43:41 +0000
committerGitHub <[email protected]>2020-01-03 11:43:41 +0000
commit1cb8aa1311668b710379158762cab9ee03a92925 (patch)
tree8d5bf0726004c76e2fedd068f6f2c3ce30b3322c /crates/ra_hir_def/src
parent4516c4c1447942a8f01b59a71dcf5abfa2c5e37a (diff)
parent84e2e173eeb84551832a0853f8a3717144640908 (diff)
Merge #2729
2729: Remove a duplicate line in `collect_defs` r=matklad a=michalt Co-authored-by: Michal Terepeta <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r--crates/ra_hir_def/src/nameres/collector.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index 8a22b0585..35b852ee2 100644
--- 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
45 // If the dependency defines a prelude, we overwrite an already defined 45 // If the dependency defines a prelude, we overwrite an already defined
46 // prelude. This is necessary to import the "std" prelude if a crate 46 // prelude. This is necessary to import the "std" prelude if a crate
47 // depends on both "core" and "std". 47 // depends on both "core" and "std".
48 let dep_def_map = db.crate_def_map(dep.crate_id);
49 if dep_def_map.prelude.is_some() { 48 if dep_def_map.prelude.is_some() {
50 def_map.prelude = dep_def_map.prelude; 49 def_map.prelude = dep_def_map.prelude;
51 } 50 }