aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r--crates/ra_project_model/src/lib.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index 3c294e065..b500a74fb 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -143,7 +143,7 @@ impl ProjectWorkspace {
143 roots.push(PackageRoot::new(root, member)); 143 roots.push(PackageRoot::new(root, member));
144 } 144 }
145 for krate in sysroot.crates() { 145 for krate in sysroot.crates() {
146 roots.push(PackageRoot::new(krate.root_dir(&sysroot).to_path_buf(), false)) 146 roots.push(PackageRoot::new(sysroot[krate].root_dir().to_path_buf(), false))
147 } 147 }
148 roots 148 roots
149 } 149 }
@@ -260,7 +260,7 @@ impl ProjectWorkspace {
260 ProjectWorkspace::Cargo { cargo, sysroot } => { 260 ProjectWorkspace::Cargo { cargo, sysroot } => {
261 let mut sysroot_crates = FxHashMap::default(); 261 let mut sysroot_crates = FxHashMap::default();
262 for krate in sysroot.crates() { 262 for krate in sysroot.crates() {
263 if let Some(file_id) = load(krate.root(&sysroot)) { 263 if let Some(file_id) = load(&sysroot[krate].root) {
264 // Crates from sysroot have `cfg(test)` disabled 264 // Crates from sysroot have `cfg(test)` disabled
265 let cfg_options = { 265 let cfg_options = {
266 let mut opts = default_cfg_options.clone(); 266 let mut opts = default_cfg_options.clone();
@@ -274,7 +274,7 @@ impl ProjectWorkspace {
274 file_id, 274 file_id,
275 Edition::Edition2018, 275 Edition::Edition2018,
276 Some( 276 Some(
277 CrateName::new(krate.name(&sysroot)) 277 CrateName::new(&sysroot[krate].name)
278 .expect("Sysroot crate names should not contain dashes"), 278 .expect("Sysroot crate names should not contain dashes"),
279 ), 279 ),
280 cfg_options, 280 cfg_options,
@@ -285,8 +285,8 @@ impl ProjectWorkspace {
285 } 285 }
286 } 286 }
287 for from in sysroot.crates() { 287 for from in sysroot.crates() {
288 for to in from.deps(&sysroot) { 288 for &to in sysroot[from].deps.iter() {
289 let name = to.name(&sysroot); 289 let name = &sysroot[to].name;
290 if let (Some(&from), Some(&to)) = 290 if let (Some(&from), Some(&to)) =
291 (sysroot_crates.get(&from), sysroot_crates.get(&to)) 291 (sysroot_crates.get(&from), sysroot_crates.get(&to))
292 { 292 {