From cd00158b1db9dd8565d2db08b4b0ebab9d5c00b3 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 11 Jan 2019 00:37:10 +0300
Subject: wire sysroot into crate graph

---
 crates/ra_lsp_server/src/project_model/sysroot.rs | 27 +++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

(limited to 'crates/ra_lsp_server/src/project_model')

diff --git a/crates/ra_lsp_server/src/project_model/sysroot.rs b/crates/ra_lsp_server/src/project_model/sysroot.rs
index c4028a1fe..1dbab57f8 100644
--- a/crates/ra_lsp_server/src/project_model/sysroot.rs
+++ b/crates/ra_lsp_server/src/project_model/sysroot.rs
@@ -20,7 +20,7 @@ impl_arena_id!(SysrootCrate);
 #[derive(Debug, Clone)]
 struct SysrootCrateData {
     name: SmolStr,
-    path: PathBuf,
+    root: PathBuf,
     deps: Vec<SysrootCrate>,
 }
 
@@ -29,6 +29,10 @@ impl Sysroot {
         self.by_name("std")
     }
 
+    pub(crate) fn crates<'a>(&'a self) -> impl Iterator<Item = SysrootCrate> + 'a {
+        self.crates.iter().map(|(id, _data)| id)
+    }
+
     pub(super) fn discover(cargo_toml: &Path) -> Result<Sysroot> {
         let rustc_output = Command::new("rustc")
             .current_dir(cargo_toml.parent().unwrap())
@@ -45,11 +49,11 @@ impl Sysroot {
             crates: Arena::default(),
         };
         for name in SYSROOT_CRATES.trim().lines() {
-            let path = src.join(format!("lib{}", name)).join("lib.rs");
-            if path.exists() {
+            let root = src.join(format!("lib{}", name)).join("lib.rs");
+            if root.exists() {
                 sysroot.crates.alloc(SysrootCrateData {
                     name: name.into(),
-                    path,
+                    root,
                     deps: Vec::new(),
                 });
             }
@@ -72,6 +76,21 @@ impl Sysroot {
     }
 }
 
+impl SysrootCrate {
+    pub(crate) fn name(self, sysroot: &Sysroot) -> &SmolStr {
+        &sysroot.crates[self].name
+    }
+    pub(crate) fn root(self, sysroot: &Sysroot) -> &Path {
+        sysroot.crates[self].root.as_path()
+    }
+    pub(crate) fn root_dir(self, sysroot: &Sysroot) -> &Path {
+        self.root(sysroot).parent().unwrap()
+    }
+    pub(crate) fn deps<'a>(self, sysroot: &'a Sysroot) -> impl Iterator<Item = SysrootCrate> + 'a {
+        sysroot.crates[self].deps.iter().map(|&it| it)
+    }
+}
+
 const SYSROOT_CRATES: &str = "
 std
 core
-- 
cgit v1.2.3