Remove simplistic interpolation for manifest-path

Author: Veykril

Diff for: crates/flycheck/src/lib.rs

@@ -23,7 +23,7 @@ pub use cargo_metadata::diagnostic::{
 
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 pub enum InvocationStrategy {
-    OnceInRoot,
+    Once,
     #[default]
     PerWorkspace,
 }
@@ -317,26 +317,10 @@ impl FlycheckActor {
                 (cmd, args, invocation_strategy)
             }
         };
-        if let InvocationStrategy::PerWorkspace = invocation_strategy {
-            let mut with_manifest_path = false;
-            for arg in args {
-                if let Some(_) = arg.find("$manifest_path") {
-                    with_manifest_path = true;
-                    cmd.arg(arg.replace(
-                        "$manifest_path",
-                        &self.root.join("Cargo.toml").display().to_string(),
-                    ));
-                } else {
-                    cmd.arg(arg);
-                }
-            }
-
-            if !with_manifest_path {
-                cmd.current_dir(&self.root);
-            }
-        } else {
-            cmd.args(args);
-        }
+        match invocation_strategy {
+            InvocationStrategy::PerWorkspace => cmd.current_dir(&self.root),
+            InvocationStrategy::Once => cmd.args(args),
+        };
         cmd
     }
 

Diff for: crates/project-model/src/build_scripts.rs

@@ -62,30 +62,7 @@ impl WorkspaceBuildScripts {
         let mut cmd = match config.run_build_script_command.as_deref() {
             Some([program, args @ ..]) => {
                 let mut cmd = Command::new(program);
-
-                // FIXME: strategy and workspace root are coupled, express that in code
-                if let (InvocationStrategy::PerWorkspace, Some(workspace_root)) =
-                    (config.invocation_strategy, workspace_root)
-                {
-                    let mut with_manifest_path = false;
-                    for arg in args {
-                        if let Some(_) = arg.find("$manifest_path") {
-                            with_manifest_path = true;
-                            cmd.arg(arg.replace(
-                                "$manifest_path",
-                                &workspace_root.join("Cargo.toml").display().to_string(),
-                            ));
-                        } else {
-                            cmd.arg(arg);
-                        }
-                    }
-
-                    if !with_manifest_path {
-                        cmd.current_dir(workspace_root);
-                    }
-                } else {
-                    cmd.args(args);
-                }
+                cmd.args(args);
                 cmd
             }
             _ => {
@@ -176,7 +153,7 @@ impl WorkspaceBuildScripts {
         workspaces: &[&CargoWorkspace],
         progress: &dyn Fn(String),
     ) -> io::Result<Vec<WorkspaceBuildScripts>> {
-        assert_eq!(config.invocation_strategy, InvocationStrategy::OnceInRoot);
+        assert_eq!(config.invocation_strategy, InvocationStrategy::Once);
         let cmd = Self::build_command(config, None)?;
         // NB: Cargo.toml could have been modified between `cargo metadata` and
         // `cargo check`. We shouldn't assume that package ids we see here are

Diff for: crates/project-model/src/lib.rs

@@ -160,7 +160,7 @@ fn utf8_stdout(mut cmd: Command) -> Result<String> {
 
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
 pub enum InvocationStrategy {
-    OnceInRoot,
+    Once,
     #[default]
     PerWorkspace,
 }

Diff for: crates/rust-analyzer/src/config.rs

@@ -70,13 +70,9 @@ config_data! {
         /// Run build scripts (`build.rs`) for more precise code analysis.
         cargo_buildScripts_enable: bool  = "true",
         /// Specifies the invocation strategy to use when running the build scripts command.
-        /// If `per_workspace` is set, the command will be executed for each workspace and all
-        /// occurrences of `$manifest_path` in the command will be replaced by the corresponding
-        /// manifest path of the workspace that the command is being invoked for. If interpolation
-        /// for the manifest path happens at least once, the commands will be executed from the
-        /// project root, otherwise the commands will be executed from the corresponding workspace
-        /// root.
-        /// If `once_in_root` is set, the command will be executed once in the project root.
+        /// If `per_workspace` is set, the command will be executed for each workspace from the
+        /// corresponding workspace root.
+        /// If `once` is set, the command will be executed once in the project root.
         /// This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
         /// is set.
         cargo_buildScripts_invocationStrategy: InvocationStrategy = "\"per_workspace\"",
@@ -134,13 +130,9 @@ config_data! {
         /// Set to `"all"` to pass `--all-features` to Cargo.
         checkOnSave_features: Option<CargoFeaturesDef>      = "null",
         /// Specifies the invocation strategy to use when running the checkOnSave command.
-        /// If `per_workspace` is set, the command will be executed for each workspace and all
-        /// occurrences of `$manifest_path` in the command will be replaced by the corresponding
-        /// manifest path of the workspace that the command is being invoked for. If interpolation
-        /// for the manifest path happens at least once, the commands will be executed from the
-        /// project root, otherwise the commands will be executed from the corresponding workspace
-        /// root.
-        /// If `once_in_root` is set, the command will be executed once in the project root.
+        /// If `per_workspace` is set, the command will be executed for each workspace from the
+        /// corresponding workspace root.
+        /// If `once` is set, the command will be executed once in the project root.
         /// This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
         /// is set.
         checkOnSave_invocationStrategy: InvocationStrategy = "\"per_workspace\"",
@@ -1079,7 +1071,7 @@ impl Config {
             unset_test_crates: UnsetTestCrates::Only(self.data.cargo_unsetTest.clone()),
             wrap_rustc_in_build_scripts: self.data.cargo_buildScripts_useRustcWrapper,
             invocation_strategy: match self.data.cargo_buildScripts_invocationStrategy {
-                InvocationStrategy::OnceInRoot => project_model::InvocationStrategy::OnceInRoot,
+                InvocationStrategy::Once => project_model::InvocationStrategy::Once,
                 InvocationStrategy::PerWorkspace => project_model::InvocationStrategy::PerWorkspace,
             },
             run_build_script_command: self.data.cargo_buildScripts_overrideCommand.clone(),
@@ -1106,7 +1098,7 @@ impl Config {
             return None;
         }
         let invocation_strategy = match self.data.checkOnSave_invocationStrategy {
-            InvocationStrategy::OnceInRoot => flycheck::InvocationStrategy::OnceInRoot,
+            InvocationStrategy::Once => flycheck::InvocationStrategy::Once,
             InvocationStrategy::PerWorkspace => flycheck::InvocationStrategy::PerWorkspace,
         };
         let flycheck_config = match &self.data.checkOnSave_overrideCommand {
@@ -1622,7 +1614,7 @@ enum CargoFeaturesDef {
 #[derive(Deserialize, Debug, Clone)]
 #[serde(rename_all = "snake_case")]
 enum InvocationStrategy {
-    OnceInRoot,
+    Once,
     PerWorkspace,
 }
 

Diff for: crates/rust-analyzer/src/reload.rs

@@ -477,7 +477,7 @@ impl GlobalState {
         | FlycheckConfig::CustomCommand { invocation_strategy, .. }) = config;
 
         self.flycheck = match invocation_strategy {
-            flycheck::InvocationStrategy::OnceInRoot => vec![FlycheckHandle::spawn(
+            flycheck::InvocationStrategy::Once => vec![FlycheckHandle::spawn(
                 0,
                 Box::new(move |msg| sender.send(msg).unwrap()),
                 config.clone(),

Diff for: docs/user/generated_config.adoc

@@ -28,13 +28,9 @@ Run build scripts (`build.rs`) for more precise code analysis.
 +
 --
 Specifies the invocation strategy to use when running the build scripts command.
-If `per_workspace` is set, the command will be executed for each workspace and all
-occurrences of `$manifest_path` in the command will be replaced by the corresponding
-manifest path of the workspace that the command is being invoked for. If interpolation
-for the manifest path happens at least once, the commands will be executed from the
-project root, otherwise the commands will be executed from the corresponding workspace
-root.
-If `once_in_root` is set, the command will be executed once in the project root.
+If `per_workspace` is set, the command will be executed for each workspace from the
+corresponding workspace root.
+If `once` is set, the command will be executed once in the project root.
 This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
 is set.
 --
@@ -136,13 +132,9 @@ Set to `"all"` to pass `--all-features` to Cargo.
 +
 --
 Specifies the invocation strategy to use when running the checkOnSave command.
-If `per_workspace` is set, the command will be executed for each workspace and all
-occurrences of `$manifest_path` in the command will be replaced by the corresponding
-manifest path of the workspace that the command is being invoked for. If interpolation
-for the manifest path happens at least once, the commands will be executed from the
-project root, otherwise the commands will be executed from the corresponding workspace
-root.
-If `once_in_root` is set, the command will be executed once in the project root.
+If `per_workspace` is set, the command will be executed for each workspace from the
+corresponding workspace root.
+If `once` is set, the command will be executed once in the project root.
 This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
 is set.
 --

Diff for: editors/code/package.json

@@ -422,7 +422,7 @@
                     "type": "boolean"
                 },
                 "rust-analyzer.cargo.buildScripts.invocationStrategy": {
-                    "markdownDescription": "Specifies the invocation strategy to use when running the build scripts command.\nIf `per_workspace` is set, the command will be executed for each workspace and all\noccurrences of `$manifest_path` in the command will be replaced by the corresponding\nmanifest path of the workspace that the command is being invoked for. If interpolation\nfor the manifest path happens at least once, the commands will be executed from the\nproject root, otherwise the commands will be executed from the corresponding workspace\nroot.\nIf `once_in_root` is set, the command will be executed once in the project root.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
+                    "markdownDescription": "Specifies the invocation strategy to use when running the build scripts command.\nIf `per_workspace` is set, the command will be executed for each workspace from the\ncorresponding workspace root.\nIf `once` is set, the command will be executed once in the project root.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
                     "default": "per_workspace",
                     "type": "string",
                     "enum": [
@@ -560,7 +560,7 @@
                     ]
                 },
                 "rust-analyzer.checkOnSave.invocationStrategy": {
-                    "markdownDescription": "Specifies the invocation strategy to use when running the checkOnSave command.\nIf `per_workspace` is set, the command will be executed for each workspace and all\noccurrences of `$manifest_path` in the command will be replaced by the corresponding\nmanifest path of the workspace that the command is being invoked for. If interpolation\nfor the manifest path happens at least once, the commands will be executed from the\nproject root, otherwise the commands will be executed from the corresponding workspace\nroot.\nIf `once_in_root` is set, the command will be executed once in the project root.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
+                    "markdownDescription": "Specifies the invocation strategy to use when running the checkOnSave command.\nIf `per_workspace` is set, the command will be executed for each workspace from the\ncorresponding workspace root.\nIf `once` is set, the command will be executed once in the project root.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
                     "default": "per_workspace",
                     "type": "string",
                     "enum": [