Propagate args and env vars properly if we don't intercept

And update Cargo.

Closes #874

Author: nrc

Cargo.lock

@@ -10,7 +10,7 @@ categories = ["development-tools"]
 build = "build.rs"
 
 [dependencies]
-cargo = { git = "https://github.com/rust-lang/cargo", rev = "9e53ac6e6525da914cb05a85e5e8eff7b5dca81f" }
+cargo = { git = "https://github.com/rust-lang/cargo", rev = "22c0f22f5621f1b68558d80a0966d073b9b68932" }
 cargo_metadata = "0.5.2"
 clippy_lints = { version = "0.0.204", optional = true }
 env_logger = "0.5"

Cargo.toml

@@ -161,7 +161,6 @@ fn run_cargo(
             trace!("Cargo compilation options:\n{:?}", opts);
             let rustflags = prepare_cargo_rustflags(&rls_config);
 
-
             for package in &packages {
                 if ws.members().find(|x| *x.name() == *package).is_none() {
                     warn!("cargo - couldn't find member package `{}` specified in `analyze_package` configuration", package);
@@ -340,7 +339,7 @@ impl Executor for RlsExecutor {
         let cargo_args = cargo_cmd.get_args();
         let crate_name =
             parse_arg(cargo_args, "--crate-name").expect("no crate-name in rustc command line");
-        trace!("exec: {}", crate_name);
+        trace!("exec: {} {:?}", crate_name, cargo_cmd);
 
         // Send off a window/progress notification for this compile target.
         // At the moment, we don't know the number of things cargo is going to compile,
@@ -389,9 +388,30 @@ impl Executor for RlsExecutor {
         cmd.program(rustc_shim);
         cmd.env(::RUSTC_SHIM_ENV_VAR_NAME, "1");
 
+        // Add args and envs to cmd.
+        let mut args: Vec<_> = cargo_args
+            .iter()
+            .map(|a| a.clone().into_string().unwrap())
+            .collect();
+        let envs = cargo_cmd.get_envs().clone();
+
         let sysroot =
             current_sysroot().expect("need to specify SYSROOT env var or use rustup or multirust");
 
+        {
+            let config = self.config.lock().unwrap();
+            if config.sysroot.is_none() {
+                args.push("--sysroot".to_owned());
+                args.push(sysroot);
+            }
+        }
+        cmd.args_replace(&args);
+        for (k, v) in &envs {
+            if let Some(v) = v {
+                cmd.env(k, v);
+            }
+        }
+
         // We only want to intercept rustc call targeting current crate to cache
         // args/envs generated by cargo so we can run only rustc later ourselves
         // Currently we don't cache nor modify build script args
@@ -403,9 +423,11 @@ impl Executor for RlsExecutor {
                 ""
             };
             trace!(
-                "rustc not intercepted - {}{}",
+                "rustc not intercepted - {}{} - args: {:?} envs: {:?}",
                 id.name(),
-                build_script_notice
+                build_script_notice,
+                cmd.get_args(),
+                cmd.get_envs(),
             );
 
             if ::blacklist::CRATE_BLACKLIST.contains(&&*crate_name) {
@@ -421,37 +443,17 @@ impl Executor for RlsExecutor {
             let save_config = serde_json::to_string(&save_config)?;
             cmd.env("RUST_SAVE_ANALYSIS_CONFIG", &OsString::from(save_config));
 
-            if self.config.lock().unwrap().sysroot.is_none() {
-                cmd.arg("--sysroot");
-                cmd.arg(&sysroot);
-            }
             return cmd.exec();
         }
 
         trace!(
             "rustc intercepted - args: {:?} envs: {:?}",
-            cargo_args,
-            cargo_cmd.get_envs()
+            args,
+            envs,
         );
 
         self.reached_primary.store(true, Ordering::SeqCst);
 
-        let mut args: Vec<_> = cargo_args
-            .iter()
-            .map(|a| a.clone().into_string().unwrap())
-            .collect();
-
-        {
-            let config = self.config.lock().unwrap();
-
-            if config.sysroot.is_none() {
-                args.push("--sysroot".to_owned());
-                args.push(sysroot);
-            }
-
-            cmd.args_replace(&args);
-        }
-
         // Cache executed command for the build plan
         {
             let mut cx = self.compilation_cx.lock().unwrap();
@@ -461,7 +463,6 @@ impl Executor for RlsExecutor {
         // Prepare modified cargo-generated args/envs for future rustc calls
         let rustc = cargo_cmd.get_program().to_owned().into_string().unwrap();
         args.insert(0, rustc);
-        let envs = cargo_cmd.get_envs().clone();
 
         // Store the modified cargo-generated args/envs for future rustc calls
         {