Fix Windows backslash interpolation

Author: Jon Gjengset

tests/cli-rustup.rs

@@ -1470,10 +1470,7 @@ fn file_override_path() {
         let toolchain_file = config.current_dir().join("rust-toolchain.toml");
         raw::write_file(
             &toolchain_file,
-            &dbg!(format!(
-                "[toolchain]\npath=\"{}\"",
-                toolchain_path.to_str().unwrap()
-            )),
+            &format!("[toolchain]\npath='{}'", toolchain_path.to_str().unwrap()),
         )
         .unwrap();
 
@@ -1510,7 +1507,7 @@ fn proxy_override_path() {
         let toolchain_file = config.current_dir().join("rust-toolchain.toml");
         raw::write_file(
             &toolchain_file,
-            &format!("[toolchain]\npath=\"{}\"", toolchain_path.to_str().unwrap()),
+            &format!("[toolchain]\npath='{}'", toolchain_path.to_str().unwrap()),
         )
         .unwrap();
 
@@ -1546,9 +1543,9 @@ fn file_override_path_relative() {
             .join("rust-toolchain.toml");
 
         // Find shared prefix so we can determine a relative path
-        let mut p1 = dbg!(&toolchain_path).components().peekable();
-        let mut p2 = dbg!(&toolchain_file).components().peekable();
-        while let (Some(p1p), Some(p2p)) = (dbg!(p1.peek()), dbg!(p2.peek())) {
+        let mut p1 = toolchain_path.components().peekable();
+        let mut p2 = toolchain_file.components().peekable();
+        while let (Some(p1p), Some(p2p)) = (p1.peek(), p2.peek()) {
             if p1p == p2p {
                 let _ = p1.next();
                 let _ = p2.next();
@@ -1559,18 +1556,17 @@ fn file_override_path_relative() {
         }
         let mut relative_path = PathBuf::new();
         // NOTE: We skip 1 since we don't need to .. across the .toml file at the end of the path
-        for p in p2.skip(1) {
-            dbg!(p);
+        for _ in p2.skip(1) {
             relative_path.push("..");
         }
         for p in p1 {
-            relative_path.push(dbg!(p));
+            relative_path.push(p);
         }
-        assert!(dbg!(&relative_path).is_relative());
+        assert!(relative_path.is_relative());
 
         raw::write_file(
             &toolchain_file,
-            &format!("[toolchain]\npath=\"{}\"", relative_path.to_str().unwrap()),
+            &format!("[toolchain]\npath='{}'", relative_path.to_str().unwrap()),
         )
         .unwrap();