Re-implement dependecny tracking for cargo script

rust-lang · Apr 19, 2024 · 0b24599 · 0b24599
1 parent 2f82807
commit 0b24599
Show file tree

Hide file tree

Showing 10 changed files with 187 additions and 234 deletions.
diff --git a/crates/load-cargo/src/lib.rs b/crates/load-cargo/src/lib.rs
@@ -335,7 +335,7 @@ fn load_crate_graph(
 ) -> RootDatabase {
     let (ProjectWorkspace::Cargo { toolchain, target_layout, .. }
     | ProjectWorkspace::Json { toolchain, target_layout, .. }
-    | ProjectWorkspace::DetachedFiles { toolchain, target_layout, .. }) = ws;
+    | ProjectWorkspace::DetachedFile { toolchain, target_layout, .. }) = ws;
 
     let lru_cap = std::env::var("RA_LRU_CAP").ok().and_then(|it| it.parse::<usize>().ok());
     let mut db = RootDatabase::new(lru_cap);

diff --git a/crates/project-model/src/cargo_workspace.rs b/crates/project-model/src/cargo_workspace.rs
@@ -305,8 +305,10 @@ impl CargoWorkspace {
                     .collect(),
             );
         }
-        if cargo_toml.extension().is_some_and(|x| x == "rs") {
-            // TODO: enable `+nightly` for cargo scripts
+        // The manifest is a rust file, so this means its a script manifest
+        if cargo_toml.extension().is_some_and(|ext| ext == "rs") {
+            // Deliberately don't set up RUSTC_BOOTSTRAP or a nightly override here, the user should
+            // opt into it themselves.
             other_options.push("-Zscript".to_owned());
         }
         meta.other_options(other_options);