From ff87726074915fe298cb37ca60b193f922a612df Mon Sep 17 00:00:00 2001
From: James Leitch <rickvanprim@gmail.com>
Date: Mon, 2 Nov 2020 10:57:31 -0700
Subject: Feedback.

---
 crates/base_db/src/fixture.rs                      | 4 +---
 crates/hir_def/src/nameres/tests/mod_resolution.rs | 2 +-
 crates/test_utils/src/fixture.rs                   | 4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'crates')

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 3c6c516b2..66e6443cb 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -150,8 +150,6 @@ impl ChangeFixture {
                 entry.text.clone()
             };
 
-            let explicit_root = entry.explicit_root;
-
             let meta = FileMeta::from(entry);
             assert!(meta.path.starts_with(&source_root_prefix));
 
@@ -171,7 +169,7 @@ impl ChangeFixture {
                     let dep = CrateName::normalize_dashes(&dep);
                     crate_deps.push((crate_name.clone(), dep))
                 }
-            } else if meta.path == "/main.rs" || meta.path == "/lib.rs" || explicit_root {
+            } else if meta.path == "/main.rs" || meta.path == "/lib.rs" {
                 assert!(default_crate_root.is_none());
                 default_crate_root = Some(file_id);
                 default_cfg = meta.cfg;
diff --git a/crates/hir_def/src/nameres/tests/mod_resolution.rs b/crates/hir_def/src/nameres/tests/mod_resolution.rs
index 0b2b4429d..ec9d589a3 100644
--- a/crates/hir_def/src/nameres/tests/mod_resolution.rs
+++ b/crates/hir_def/src/nameres/tests/mod_resolution.rs
@@ -323,7 +323,7 @@ pub struct Baz;
 fn module_resolution_relative_path_outside_root() {
     check(
         r#"
-//- /a/b/c/d/e/main.rs root:
+//- /a/b/c/d/e/main.rs crate:main
 #[path="../../../../../outside.rs"]
 mod foo;
 
diff --git a/crates/test_utils/src/fixture.rs b/crates/test_utils/src/fixture.rs
index 806ab06c1..e40b61a94 100644
--- a/crates/test_utils/src/fixture.rs
+++ b/crates/test_utils/src/fixture.rs
@@ -8,7 +8,6 @@ use stdx::{lines_with_ends, split_once, trim_indent};
 pub struct Fixture {
     pub path: String,
     pub text: String,
-    pub explicit_root: bool,
     pub krate: Option<String>,
     pub deps: Vec<String>,
     pub cfg_atoms: Vec<String>,
@@ -65,7 +64,6 @@ impl Fixture {
         let path = components[0].to_string();
         assert!(path.starts_with('/'));
 
-        let mut explicit_root = false;
         let mut krate = None;
         let mut deps = Vec::new();
         let mut edition = None;
@@ -75,7 +73,6 @@ impl Fixture {
         for component in components[1..].iter() {
             let (key, value) = split_once(component, ':').unwrap();
             match key {
-                "root" => explicit_root = true,
                 "crate" => krate = Some(value.to_string()),
                 "deps" => deps = value.split(',').map(|it| it.to_string()).collect(),
                 "edition" => edition = Some(value.to_string()),
@@ -101,7 +98,6 @@ impl Fixture {
         Fixture {
             path,
             text: String::new(),
-            explicit_root: explicit_root,
             krate: krate,
             deps,
             cfg_atoms,
-- 
cgit v1.2.3