Merge branch 'main' into redsun82/rust-turn-off-ra-resolution

rust/extractor/src/config.rs

@@ -60,6 +60,12 @@ pub struct Config {
     pub qltest: bool,
     pub qltest_cargo_check: bool,
     pub qltest_dependencies: Vec<String>,
+    pub sysroot: Option<PathBuf>,
+    pub sysroot_src: Option<PathBuf>,
+    pub rustc_src: Option<PathBuf>,
+    pub build_script_command: Vec<String>,
+    pub extra_includes: Vec<PathBuf>,
+    pub proc_macro_server: Option<PathBuf>,
     pub skip_path_resolution: bool,
 }
 

rust/extractor/src/main.rs

@@ -244,7 +244,8 @@ fn main() -> anyhow::Result<()> {
         }
         extractor.extract_without_semantics(file, "no manifest found");
     }
-    let cargo_config = cfg.to_cargo_config(&cwd()?);
+    let cwd = cwd()?;
+    let (cargo_config, load_cargo_config) = cfg.to_cargo_config(&cwd);
     let resolve_paths = if cfg.skip_path_resolution {
         ResolvePaths::No
     } else {