Fix Windows rustc env var display

Michael Wright · Michael Wright · commit e557f6602492 · 2018-12-28T11:09:19.000+02:00
Remove the space at the end of the set commands.
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(

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ impl fmt::Display for ProcessBuilder {`
`40`	`40`	`if let Some(val) = val {`
`41`	`41`	`let val = escape(val.to_string_lossy());`
`42`	`42`	`if cfg!(windows) {`
`43`		`- write!(f, "set {}={} && ", key, val)?;`
	`43`	`+ write!(f, "set {}={}&& ", key, val)?;`
`44`	`44`	`} else {`
`45`	`45`	`write!(f, "{}={} ", key, val)?;`
`46`	`46`	`}`