aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2020-03-09 10:18:41 +0000
committerAleksey Kladov <[email protected]>2020-03-09 10:19:03 +0000
commit100cbc57ce2bd903ecab7d8bfb0abf7777076510 (patch)
tree3cdab407d70196f5310f3bf9c60b6646f195f371
parentd0d5aa935b8b5ceb339fb2afabf449032559766a (diff)
Simplify
-rw-r--r--crates/ra_db/src/input.rs8
-rw-r--r--crates/ra_hir/src/code_model.rs2
2 files changed, 2 insertions, 8 deletions
diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs
index 2912eb9ba..b77640b2b 100644
--- a/crates/ra_db/src/input.rs
+++ b/crates/ra_db/src/input.rs
@@ -207,7 +207,7 @@ impl CrateGraph {
207 } 207 }
208 208
209 for dep in &self[from].dependencies { 209 for dep in &self[from].dependencies {
210 let crate_id = dep.crate_id(); 210 let crate_id = dep.crate_id;
211 if crate_id == target { 211 if crate_id == target {
212 return true; 212 return true;
213 } 213 }
@@ -261,12 +261,6 @@ impl fmt::Display for Edition {
261 } 261 }
262} 262}
263 263
264impl Dependency {
265 pub fn crate_id(&self) -> CrateId {
266 self.crate_id
267 }
268}
269
270#[derive(Debug)] 264#[derive(Debug)]
271pub struct ParseEditionError { 265pub struct ParseEditionError {
272 invalid_input: String, 266 invalid_input: String,
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index a53c4961e..41d4e2ed3 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -58,7 +58,7 @@ impl Crate {
58 .dependencies 58 .dependencies
59 .iter() 59 .iter()
60 .map(|dep| { 60 .map(|dep| {
61 let krate = Crate { id: dep.crate_id() }; 61 let krate = Crate { id: dep.crate_id };
62 let name = dep.as_name(); 62 let name = dep.as_name();
63 CrateDependency { krate, name } 63 CrateDependency { krate, name }
64 }) 64 })