From 0320ebdd101b01abe5f24e9efcef7c15005fd3a5 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 9 Mar 2020 11:11:59 +0100
Subject: Use `Index` for CrateGraph

---
 crates/ra_hir/src/code_model.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'crates/ra_hir/src')

diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index 78c444037..a53c4961e 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -54,8 +54,7 @@ pub struct CrateDependency {
 
 impl Crate {
     pub fn dependencies(self, db: &impl DefDatabase) -> Vec<CrateDependency> {
-        db.crate_graph()
-            .crate_data(&self.id)
+        db.crate_graph()[self.id]
             .dependencies
             .iter()
             .map(|dep| {
@@ -72,7 +71,7 @@ impl Crate {
         crate_graph
             .iter()
             .filter(|&krate| {
-                crate_graph.crate_data(&krate).dependencies.iter().any(|it| it.crate_id == self.id)
+                crate_graph[krate].dependencies.iter().any(|it| it.crate_id == self.id)
             })
             .map(|id| Crate { id })
             .collect()
@@ -84,11 +83,11 @@ impl Crate {
     }
 
     pub fn root_file(self, db: &impl DefDatabase) -> FileId {
-        db.crate_graph().crate_data(&self.id).root_file_id
+        db.crate_graph()[self.id].root_file_id
     }
 
     pub fn edition(self, db: &impl DefDatabase) -> Edition {
-        db.crate_graph().crate_data(&self.id).edition
+        db.crate_graph()[self.id].edition
     }
 
     pub fn all(db: &impl DefDatabase) -> Vec<Crate> {
-- 
cgit v1.2.3


From 100cbc57ce2bd903ecab7d8bfb0abf7777076510 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Mon, 9 Mar 2020 11:18:41 +0100
Subject: Simplify

---
 crates/ra_hir/src/code_model.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'crates/ra_hir/src')

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 {
             .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 }
             })
-- 
cgit v1.2.3