Fix Windows rustc env var display

Remove the space at the end of the set commands.
rust-lang · Dec 28, 2018 · e557f66 · e557f66
1 parent 8139037
commit e557f66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/cargo/util/process_builder.rs b/src/cargo/util/process_builder.rs
@@ -40,7 +40,7 @@ impl fmt::Display for ProcessBuilder {
                 if let Some(val) = val {
                     let val = escape(val.to_string_lossy());
                     if cfg!(windows) {
-                        write!(f, "set {}={} && ", key, val)?;
+                        write!(f, "set {}={}&& ", key, val)?;
                     } else {
                         write!(f, "{}={} ", key, val)?;
                     }

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
@@ -1572,9 +1572,9 @@ fn vv_prints_rustc_env_vars() {
 
     if cfg!(windows) {
         b.with_stderr_contains(
-            "[RUNNING] `[..]set CARGO_PKG_NAME=foo && [..]rustc [..]`"
+            "[RUNNING] `[..]set CARGO_PKG_NAME=foo&& [..]rustc [..]`"
         ).with_stderr_contains(
-            r#"[RUNNING] `[..]set CARGO_PKG_AUTHORS="escape='\"@example.com" && [..]rustc [..]`"#
+            r#"[RUNNING] `[..]set CARGO_PKG_AUTHORS="escape='\"@example.com"&& [..]rustc [..]`"#
         )
     } else {
         b.with_stderr_contains(