fix: Parse cargo config files with origins

Author: ShoyuVanilla

crates/project-model/src/cargo_config_file.rs

@@ -1,37 +1,131 @@
-//! Read `.cargo/config.toml` as a JSON object
-use paths::{Utf8Path, Utf8PathBuf};
+//! Read `.cargo/config.toml` as a TOML table
+use paths::{AbsPath, Utf8Path, Utf8PathBuf};
 use rustc_hash::FxHashMap;
+use toml::{
+    Spanned,
+    de::{DeTable, DeValue},
+};
 use toolchain::Tool;
 
 use crate::{ManifestPath, Sysroot, utf8_stdout};
 
-pub(crate) type CargoConfigFile = serde_json::Map<String, serde_json::Value>;
-
-pub(crate) fn read(
-    manifest: &ManifestPath,
-    extra_env: &FxHashMap<String, Option<String>>,
-    sysroot: &Sysroot,
-) -> Option<CargoConfigFile> {
-    let mut cargo_config = sysroot.tool(Tool::Cargo, manifest.parent(), extra_env);
-    cargo_config
-        .args(["-Z", "unstable-options", "config", "get", "--format", "json"])
-        .env("RUSTC_BOOTSTRAP", "1");
-    if manifest.is_rust_manifest() {
-        cargo_config.arg("-Zscript");
-    }
-
-    tracing::debug!("Discovering cargo config by {:?}", cargo_config);
-    let json: serde_json::Map<String, serde_json::Value> = utf8_stdout(&mut cargo_config)
-        .inspect(|json| {
-            tracing::debug!("Discovered cargo config: {:?}", json);
-        })
-        .inspect_err(|err| {
-            tracing::debug!("Failed to discover cargo config: {:?}", err);
-        })
-        .ok()
-        .and_then(|stdout| serde_json::from_str(&stdout).ok())?;
-
-    Some(json)
+#[derive(Clone)]
+pub struct CargoConfigFile(String);
+
+impl CargoConfigFile {
+    pub(crate) fn load(
+        manifest: &ManifestPath,
+        extra_env: &FxHashMap<String, Option<String>>,
+        sysroot: &Sysroot,
+    ) -> Option<Self> {
+        let mut cargo_config = sysroot.tool(Tool::Cargo, manifest.parent(), extra_env);
+        cargo_config
+            .args(["-Z", "unstable-options", "config", "get", "--format", "toml", "--show-origin"])
+            .env("RUSTC_BOOTSTRAP", "1");
+        if manifest.is_rust_manifest() {
+            cargo_config.arg("-Zscript");
+        }
+
+        tracing::debug!("Discovering cargo config by {cargo_config:?}");
+        utf8_stdout(&mut cargo_config)
+            .inspect(|toml| {
+                tracing::debug!("Discovered cargo config: {toml:?}");
+            })
+            .inspect_err(|err| {
+                tracing::debug!("Failed to discover cargo config: {err:?}");
+            })
+            .ok()
+            .map(CargoConfigFile)
+    }
+
+    pub(crate) fn read<'a>(&'a self) -> Option<CargoConfigFileReader<'a>> {
+        CargoConfigFileReader::new(&self.0)
+    }
+
+    #[cfg(test)]
+    pub(crate) fn from_string_for_test(s: String) -> Self {
+        CargoConfigFile(s)
+    }
+}
+
+pub(crate) struct CargoConfigFileReader<'a> {
+    toml_str: &'a str,
+    line_ends: Vec<usize>,
+    table: Spanned<DeTable<'a>>,
+}
+
+impl<'a> CargoConfigFileReader<'a> {
+    fn new(toml_str: &'a str) -> Option<Self> {
+        let toml = DeTable::parse(toml_str)
+            .inspect_err(|err| tracing::debug!("Failed to parse cargo config into toml: {err:?}"))
+            .ok()?;
+        let line_ends = toml_str.lines().fold(vec![], |mut acc, l| {
+            acc.push(acc.last().copied().unwrap_or(0_usize) + l.len() + 1);
+            acc
+        });
+
+        Some(CargoConfigFileReader { toml_str, table: toml, line_ends })
+    }
+
+    pub(crate) fn get_spanned(
+        &self,
+        accessor: impl IntoIterator<Item = &'a str>,
+    ) -> Option<&Spanned<DeValue<'a>>> {
+        let mut keys = accessor.into_iter();
+        let mut val = self.table.get_ref().get(keys.next()?)?;
+        for key in keys {
+            let DeValue::Table(map) = val.get_ref() else { return None };
+            val = map.get(key)?;
+        }
+        Some(val)
+    }
+
+    pub(crate) fn get(&self, accessor: impl IntoIterator<Item = &'a str>) -> Option<&DeValue<'a>> {
+        self.get_spanned(accessor).map(|it| it.as_ref())
+    }
+
+    pub(crate) fn get_origin_root(&self, spanned: &Spanned<DeValue<'a>>) -> Option<&AbsPath> {
+        let span = spanned.span();
+
+        for &line_end in &self.line_ends {
+            if line_end < span.end {
+                continue;
+            }
+
+            let after_span = &self.toml_str[span.end..line_end];
+
+            // table.key = "value" # /parent/.cargo/config.toml
+            //                   |                            |
+            //                   span.end                     end
+            let origin_path = after_span
+                .strip_prefix([',']) // strip trailing comma
+                .unwrap_or(after_span)
+                .trim_start()
+                .strip_prefix(['#'])
+                .and_then(|path| {
+                    let path = path.trim();
+                    if path.starts_with("environment variable")
+                        || path.starts_with("--config cli option")
+                    {
+                        None
+                    } else {
+                        Some(path)
+                    }
+                });
+
+            return origin_path.and_then(|path| {
+                <&Utf8Path>::from(path)
+                    .try_into()
+                    .ok()
+                    // Two levels up to the config file.
+                    // See https://doc.rust-lang.org/cargo/reference/config.html#config-relative-paths
+                    .and_then(AbsPath::parent)
+                    .and_then(AbsPath::parent)
+            });
+        }
+
+        None
+    }
 }
 
 pub(crate) fn make_lockfile_copy(
@@ -54,3 +148,59 @@ pub(crate) fn make_lockfile_copy(
         }
     }
 }
+
+#[test]
+fn cargo_config_file_reader_works() {
+    let toml = r##"
+alias.foo = "abc"
+alias.bar = "🙂" # /ROOT/home/.cargo/config.toml
+alias.sub-example = [
+    "sub", # /ROOT/foo/.cargo/config.toml
+    "example", # /ROOT/bar/.cargo/config.toml
+]
+build.rustflags = [
+    "--flag", # /ROOT/home/.cargo/config.toml
+    "env", # environment variable `CARGO_BUILD_RUSTFLAGS`
+    "cli", # --config cli option
+]
+env.CARGO_WORKSPACE_DIR.relative = true # /ROOT/home/.cargo/config.toml
+env.CARGO_WORKSPACE_DIR.value = "" # /ROOT/home/.cargo/config.toml
+"##;
+    #[cfg(target_os = "windows")]
+    let toml = &toml.replace("/ROOT", "C:/");
+
+    let reader = CargoConfigFileReader::new(toml).unwrap();
+
+    let alias_foo = reader.get_spanned(["alias", "foo"]).unwrap();
+    assert_eq!(alias_foo.as_ref().as_str().unwrap(), "abc");
+    assert!(reader.get_origin_root(alias_foo).is_none());
+
+    let alias_bar = reader.get_spanned(["alias", "bar"]).unwrap();
+    assert_eq!(alias_bar.as_ref().as_str().unwrap(), "🙂");
+    assert_eq!(reader.get_origin_root(alias_bar).unwrap().as_str(), "/ROOT/home");
+
+    let alias_sub_example = reader.get_spanned(["alias", "sub-example"]).unwrap();
+    assert!(reader.get_origin_root(alias_sub_example).is_none());
+    let alias_sub_example = alias_sub_example.as_ref().as_array().unwrap();
+
+    assert_eq!(alias_sub_example[0].get_ref().as_str().unwrap(), "sub");
+    assert_eq!(reader.get_origin_root(&alias_sub_example[0]).unwrap().as_str(), "/ROOT/foo");
+
+    assert_eq!(alias_sub_example[1].get_ref().as_str().unwrap(), "example");
+    assert_eq!(reader.get_origin_root(&alias_sub_example[1]).unwrap().as_str(), "/ROOT/bar");
+
+    let build_rustflags = reader.get(["build", "rustflags"]).unwrap().as_array().unwrap();
+    assert_eq!(reader.get_origin_root(&build_rustflags[0]).unwrap().as_str(), "/ROOT/home");
+    assert!(reader.get_origin_root(&build_rustflags[1]).is_none());
+    assert!(reader.get_origin_root(&build_rustflags[2]).is_none());
+
+    let env_cargo_workspace_dir =
+        reader.get(["env", "CARGO_WORKSPACE_DIR"]).unwrap().as_table().unwrap();
+    let env_relative = &env_cargo_workspace_dir["relative"];
+    assert!(env_relative.as_ref().as_bool().unwrap());
+    assert_eq!(reader.get_origin_root(env_relative).unwrap().as_str(), "/ROOT/home");
+
+    let env_val = &env_cargo_workspace_dir["value"];
+    assert_eq!(env_val.as_ref().as_str().unwrap(), "");
+    assert_eq!(reader.get_origin_root(env_val).unwrap().as_str(), "/ROOT/home");
+}

crates/project-model/src/env.rs

@@ -1,10 +1,9 @@
 //! Cargo-like environment variables injection.
 use base_db::Env;
-use paths::Utf8Path;
 use rustc_hash::FxHashMap;
 use toolchain::Tool;
 
-use crate::{ManifestPath, PackageData, TargetKind, cargo_config_file::CargoConfigFile};
+use crate::{PackageData, TargetKind, cargo_config_file::CargoConfigFile};
 
 /// Recreates the compile-time environment variables that Cargo sets.
 ///
@@ -62,46 +61,48 @@ pub(crate) fn inject_rustc_tool_env(env: &mut Env, cargo_name: &str, kind: Targe
 }
 
 pub(crate) fn cargo_config_env(
-    manifest: &ManifestPath,
     config: &Option<CargoConfigFile>,
     extra_env: &FxHashMap<String, Option<String>>,
 ) -> Env {
+    use toml::de::*;
+
     let mut env = Env::default();
     env.extend(extra_env.iter().filter_map(|(k, v)| v.as_ref().map(|v| (k.clone(), v.clone()))));
 
-    let Some(serde_json::Value::Object(env_json)) = config.as_ref().and_then(|c| c.get("env"))
-    else {
+    let Some(config_reader) = config.as_ref().and_then(|c| c.read()) else {
+        return env;
+    };
+    let Some(env_toml) = config_reader.get(["env"]).and_then(|it| it.as_table()) else {
         return env;
     };
 
-    // FIXME: The base here should be the parent of the `.cargo/config` file, not the manifest.
-    // But cargo does not provide this information.
-    let base = <_ as AsRef<Utf8Path>>::as_ref(manifest.parent());
-
-    for (key, entry) in env_json {
-        let value = match entry {
-            serde_json::Value::String(s) => s.clone(),
-            serde_json::Value::Object(entry) => {
+    for (key, entry) in env_toml {
+        let key = key.as_ref().as_ref();
+        let value = match entry.as_ref() {
+            DeValue::String(s) => String::from(s.clone()),
+            DeValue::Table(entry) => {
                 // Each entry MUST have a `value` key.
-                let Some(value) = entry.get("value").and_then(|v| v.as_str()) else {
+                let Some(map) = entry.get("value").and_then(|v| v.as_ref().as_str()) else {
                     continue;
                 };
                 // If the entry already exists in the environment AND the `force` key is not set to
                 // true, then don't overwrite the value.
                 if extra_env.get(key).is_some_and(Option::is_some)
-                    && !entry.get("force").and_then(|v| v.as_bool()).unwrap_or(false)
+                    && !entry.get("force").and_then(|v| v.as_ref().as_bool()).unwrap_or(false)
                 {
                     continue;
                 }
 
-                if entry
-                    .get("relative")
-                    .and_then(|v| v.as_bool())
-                    .is_some_and(std::convert::identity)
-                {
-                    base.join(value).to_string()
+                if let Some(base) = entry.get("relative").and_then(|v| {
+                    if v.as_ref().as_bool().is_some_and(std::convert::identity) {
+                        config_reader.get_origin_root(v)
+                    } else {
+                        None
+                    }
+                }) {
+                    base.join(map).to_string()
                 } else {
-                    value.to_owned()
+                    map.to_owned()
                 }
             }
             _ => continue,
@@ -115,43 +116,30 @@ pub(crate) fn cargo_config_env(
 
 #[test]
 fn parse_output_cargo_config_env_works() {
+    use itertools::Itertools;
+
+    let cwd = paths::AbsPathBuf::try_from(
+        paths::Utf8PathBuf::try_from(std::env::current_dir().unwrap()).unwrap(),
+    )
+    .unwrap();
+    let config_path = cwd.join(".cargo").join("config.toml");
     let raw = r#"
-{
-  "env": {
-    "CARGO_WORKSPACE_DIR": {
-      "relative": true,
-      "value": ""
-    },
-    "INVALID": {
-      "relative": "invalidbool",
-      "value": "../relative"
-    },
-    "RELATIVE": {
-      "relative": true,
-      "value": "../relative"
-    },
-    "TEST": {
-      "value": "test"
-    },
-    "FORCED": {
-      "value": "test",
-      "force": true
-    },
-    "UNFORCED": {
-      "value": "test",
-      "force": false
-    },
-    "OVERWRITTEN": {
-      "value": "test"
-    },
-    "NOT_AN_OBJECT": "value"
-  }
-}
+env.CARGO_WORKSPACE_DIR.relative = true
+env.CARGO_WORKSPACE_DIR.value = ""
+env.INVALID.relative = "invalidbool"
+env.INVALID.value = "../relative"
+env.RELATIVE.relative = true
+env.RELATIVE.value = "../relative"
+env.TEST.value = "test"
+env.FORCED.value = "test"
+env.FORCED.force = true
+env.UNFORCED.value = "test"
+env.UNFORCED.forced = false
+env.OVERWRITTEN.value = "test"
+env.NOT_AN_OBJECT = "value"
 "#;
-    let config: CargoConfigFile = serde_json::from_str(raw).unwrap();
-    let cwd = paths::Utf8PathBuf::try_from(std::env::current_dir().unwrap()).unwrap();
-    let manifest = paths::AbsPathBuf::assert(cwd.join("Cargo.toml"));
-    let manifest = ManifestPath::try_from(manifest).unwrap();
+    let raw = raw.lines().map(|l| format!("{l} # {config_path}")).join("\n");
+    let config = CargoConfigFile::from_string_for_test(raw);
     let extra_env = [
         ("FORCED", Some("ignored")),
         ("UNFORCED", Some("newvalue")),
@@ -161,7 +149,7 @@ fn parse_output_cargo_config_env_works() {
     .iter()
     .map(|(k, v)| (k.to_string(), v.map(ToString::to_string)))
     .collect();
-    let env = cargo_config_env(&manifest, &Some(config), &extra_env);
+    let env = cargo_config_env(&Some(config), &extra_env);
     assert_eq!(env.get("CARGO_WORKSPACE_DIR").as_deref(), Some(cwd.join("").as_str()));
     assert_eq!(env.get("RELATIVE").as_deref(), Some(cwd.join("../relative").as_str()));
     assert_eq!(env.get("INVALID").as_deref(), Some("../relative"));