From 100cbc57ce2bd903ecab7d8bfb0abf7777076510 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Mon, 9 Mar 2020 11:18:41 +0100 Subject: [PATCH] Simplify --- crates/ra_db/src/input.rs | 8 +------- crates/ra_hir/src/code_model.rs | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/crates/ra_db/src/input.rs b/crates/ra_db/src/input.rs index 2912eb9ba27b..b77640b2bc67 100644 --- a/crates/ra_db/src/input.rs +++ b/crates/ra_db/src/input.rs @@ -207,7 +207,7 @@ impl CrateGraph { } for dep in &self[from].dependencies { - let crate_id = dep.crate_id(); + let crate_id = dep.crate_id; if crate_id == target { return true; } @@ -261,12 +261,6 @@ impl fmt::Display for Edition { } } -impl Dependency { - pub fn crate_id(&self) -> CrateId { - self.crate_id - } -} - #[derive(Debug)] pub struct ParseEditionError { invalid_input: String, diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs index a53c4961eefb..41d4e2ed3ed1 100644 --- a/crates/ra_hir/src/code_model.rs +++ b/crates/ra_hir/src/code_model.rs @@ -58,7 +58,7 @@ impl Crate { .dependencies .iter() .map(|dep| { - let krate = Crate { id: dep.crate_id() }; + let krate = Crate { id: dep.crate_id }; let name = dep.as_name(); CrateDependency { krate, name } })