Allow sysroots to only consist of the source root dir

Author: Veykril

src/tools/rust-analyzer/crates/hir-ty/src/layout/tests.rs

@@ -1,7 +1,7 @@
 use chalk_ir::{AdtId,TyKind};
 use either::Either;
 use hir_def::db::DefDatabase;
-use project_model::target_data_layout::RustcDataLayoutConfig;
+use project_model::{target_data_layout::RustcDataLayoutConfig,Sysroot};
 use rustc_hash::FxHashMap;
 use test_fixture::WithFixture;
 use triomphe::Arc;
@@ -17,7 +17,7 @@ mod closure;
 
 fncurrent_machine_data_layout() -> String{
  project_model::target_data_layout::get(
-RustcDataLayoutConfig::Rustc(None),
+RustcDataLayoutConfig::Rustc(&Sysroot::empty()),
 None,
 &FxHashMap::default(),
 )

src/tools/rust-analyzer/crates/project-model/src/build_scripts.rs

@@ -65,7 +65,7 @@ impl WorkspaceBuildScripts {
 allowed_features:&FxHashSet<String>,
 manifest_path:&ManifestPath,
 toolchain:Option<&Version>,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 ) -> io::Result<Command>{
 constRUST_1_75:Version = Version::new(1,75,0);
 letmut cmd = match config.run_build_script_command.as_deref(){
@@ -75,7 +75,7 @@ impl WorkspaceBuildScripts {
  cmd
 }
  _ => {
-letmut cmd = Sysroot::tool(sysroot,Tool::Cargo);
+letmut cmd = sysroot.tool(Tool::Cargo);
 
  cmd.args(["check","--quiet","--workspace","--message-format=json"]);
  cmd.args(&config.extra_args);
@@ -149,7 +149,7 @@ impl WorkspaceBuildScripts {
 workspace:&CargoWorkspace,
 progress:&dynFn(String),
 toolchain:Option<&Version>,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 ) -> io::Result<WorkspaceBuildScripts>{
 let current_dir = match&config.invocation_location{
 InvocationLocation::Root(root)if config.run_build_script_command.is_some() => {
@@ -195,7 +195,7 @@ impl WorkspaceBuildScripts {
 // This is not gonna be used anyways, so just construct a dummy here
 &ManifestPath::try_from(workspace_root.clone()).unwrap(),
 None,
-None,
+&Sysroot::empty(),
 )?;
 // NB: Cargo.toml could have been modified between `cargo metadata` and
 // `cargo check`. We shouldn't assume that package ids we see here are
@@ -412,15 +412,15 @@ impl WorkspaceBuildScripts {
 rustc:&CargoWorkspace,
 current_dir:&AbsPath,
 extra_env:&FxHashMap<String,String>,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 ) -> Self{
 letmut bs = WorkspaceBuildScripts::default();
 for p in rustc.packages(){
  bs.outputs.insert(p,BuildScriptOutput::default());
 }
 let res = (|| {
 let target_libdir = (|| {
-letmut cargo_config = Sysroot::tool(sysroot,Tool::Cargo);
+letmut cargo_config = sysroot.tool(Tool::Cargo);
  cargo_config.envs(extra_env);
  cargo_config
 .current_dir(current_dir)
@@ -429,7 +429,7 @@ impl WorkspaceBuildScripts {
 ifletOk(it) = utf8_stdout(cargo_config){
 returnOk(it);
 }
-letmut cmd = Sysroot::tool(sysroot,Tool::Rustc);
+letmut cmd = sysroot.tool(Tool::Rustc);
  cmd.envs(extra_env);
  cmd.args(["--print","target-libdir"]);
 utf8_stdout(cmd)

src/tools/rust-analyzer/crates/project-model/src/cargo_workspace.rs

@@ -258,12 +258,12 @@ impl CargoWorkspace {
 cargo_toml:&ManifestPath,
 current_dir:&AbsPath,
 config:&CargoConfig,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 progress:&dynFn(String),
 ) -> anyhow::Result<cargo_metadata::Metadata>{
 let targets = find_list_of_build_targets(config, cargo_toml, sysroot);
 
-let cargo = Sysroot::tool(sysroot,Tool::Cargo);
+let cargo = sysroot.tool(Tool::Cargo);
 letmut meta = MetadataCommand::new();
  meta.cargo_path(cargo.get_program());
  cargo.get_envs().for_each(|(var, val)| _ = meta.env(var, val.unwrap_or_default()));
@@ -536,7 +536,7 @@ impl CargoWorkspace {
 fnfind_list_of_build_targets(
 config:&CargoConfig,
 cargo_toml:&ManifestPath,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 ) -> Vec<String>{
 ifletSome(target) = &config.target{
 return[target.into()].to_vec();
@@ -553,9 +553,9 @@ fn find_list_of_build_targets(
 fnrustc_discover_host_triple(
 cargo_toml:&ManifestPath,
 extra_env:&FxHashMap<String,String>,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 ) -> Option<String>{
-letmut rustc = Sysroot::tool(sysroot,Tool::Rustc);
+letmut rustc = sysroot.tool(Tool::Rustc);
  rustc.envs(extra_env);
  rustc.current_dir(cargo_toml.parent()).arg("-vV");
  tracing::debug!("Discovering host platform by {:?}", rustc);
@@ -581,9 +581,9 @@ fn rustc_discover_host_triple(
 fncargo_config_build_target(
 cargo_toml:&ManifestPath,
 extra_env:&FxHashMap<String,String>,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 ) -> Vec<String>{
-letmut cargo_config = Sysroot::tool(sysroot,Tool::Cargo);
+letmut cargo_config = sysroot.tool(Tool::Cargo);
  cargo_config.envs(extra_env);
  cargo_config
 .current_dir(cargo_toml.parent())

src/tools/rust-analyzer/crates/project-model/src/env.rs

@@ -62,9 +62,9 @@ pub(crate) fn inject_rustc_tool_env(env: &mut Env, cargo_name: &str, kind: Targe
 pub(crate)fncargo_config_env(
 manifest:&ManifestPath,
 extra_env:&FxHashMap<String,String>,
-sysroot:Option<&Sysroot>,
+sysroot:&Sysroot,
 ) -> FxHashMap<String,String>{
-letmut cargo_config = Sysroot::tool(sysroot,Tool::Cargo);
+letmut cargo_config = sysroot.tool(Tool::Cargo);
  cargo_config.envs(extra_env);
  cargo_config
 .current_dir(manifest.parent())

src/tools/rust-analyzer/crates/project-model/src/rustc_cfg.rs

@@ -10,10 +10,10 @@ use crate::{cfg::CfgFlag, utf8_stdout, ManifestPath, Sysroot};
 pub(crate)enumRustcCfgConfig<'a>{
 /// Use `rustc --print cfg`, either from with the binary from the sysroot or by discovering via
 /// [`toolchain::rustc`].
-Rustc(Option<&'aSysroot>),
+Rustc(&'aSysroot),
 /// Use `cargo --print cfg`, either from with the binary from the sysroot or by discovering via
 /// [`toolchain::cargo`].
-Cargo(Option<&'aSysroot>,&'aManifestPath),
+Cargo(&'aSysroot,&'aManifestPath),
 }
 
 pub(crate)fnget(
@@ -65,7 +65,7 @@ fn get_rust_cfgs(
 ) -> anyhow::Result<String>{
 let sysroot = match config {
 RustcCfgConfig::Cargo(sysroot, cargo_toml) => {
-letmut cmd = Sysroot::tool(sysroot,Tool::Cargo);
+letmut cmd = sysroot.tool(Tool::Cargo);
 
  cmd.envs(extra_env);
  cmd.current_dir(cargo_toml.parent())
@@ -86,7 +86,7 @@ fn get_rust_cfgs(
 RustcCfgConfig::Rustc(sysroot) => sysroot,
 };
 
-letmut cmd = Sysroot::tool(sysroot,Tool::Rustc);
+letmut cmd = sysroot.tool(Tool::Rustc);
  cmd.envs(extra_env);
  cmd.args(["--print","cfg","-O"]);
 ifletSome(target) = target {