test: simplify .display().to_string() in .extend_redactions()

Author: rami3l

tests/suite/cli_exact.rs

@@ -330,7 +330,7 @@ async fn override_again() {
     cx.config
         .expect(["rustup", "override", "add", "nightly"])
         .await
-        .extend_redactions([("[CWD]", cx.config.current_dir().display().to_string())])
+        .extend_redactions([("[CWD]", cx.config.current_dir())])
         .is_ok()
         .with_stdout(snapbox::str![[""]])
         .with_stderr(snapbox::str![[r#"
@@ -351,7 +351,7 @@ async fn remove_override() {
         cx.config
             .expect(["rustup", "override", keyword])
             .await
-            .extend_redactions([("[CWD]", cwd.display().to_string())])
+            .extend_redactions([("[CWD]", cwd)])
             .is_ok()
             .with_stdout(snapbox::str![[""]])
             .with_stderr(snapbox::str![[r#"
@@ -369,7 +369,7 @@ async fn remove_override_none() {
         cx.config
             .expect(["rustup", "override", keyword])
             .await
-            .extend_redactions([("[CWD]", cwd.display().to_string())])
+            .extend_redactions([("[CWD]", cwd)])
             .is_ok()
             .with_stdout(snapbox::str![[""]])
             .with_stderr(snapbox::str![[r#"
@@ -406,7 +406,7 @@ async fn remove_override_with_path() {
                 dir.path().to_str().unwrap(),
             ])
             .await
-            .extend_redactions([("[PATH]", dir.path().display().to_string())])
+            .extend_redactions([("[PATH]", dir.path().to_owned())])
             .is_ok()
             .with_stdout(snapbox::str![[""]])
             .with_stderr(snapbox::str![[r#"
@@ -442,7 +442,7 @@ async fn remove_override_with_path_deleted() {
                 path.to_str().unwrap(),
             ])
             .await
-            .extend_redactions([("[PATH]", path.display().to_string())])
+            .extend_redactions([("[PATH]", path)])
             .is_ok()
             .with_stdout(snapbox::str![[""]])
             .with_stderr(snapbox::str![[r#"
@@ -476,7 +476,7 @@ async fn remove_override_nonexistent() {
         cx.config
             .expect(["rustup", "override", keyword, "--nonexistent"])
             .await
-            .extend_redactions([("[PATH]", path.display().to_string())])
+            .extend_redactions([("[PATH]", path)])
             .is_ok()
             .with_stdout(snapbox::str![[""]])
             .with_stderr(snapbox::str![[r#"

tests/suite/cli_misc.rs

@@ -1643,7 +1643,7 @@ async fn rust_analyzer_proxy_falls_back_external() {
             [("PATH", &*extern_dir.display().to_string())],
         )
         .await
-        .extend_redactions([("[REAL_PATH]", real_path.display().to_string())])
+        .extend_redactions([("[REAL_PATH]", real_path.to_owned())])
         .with_stderr(snapbox::str![[r#"
 [REAL_PATH]
 
@@ -1658,7 +1658,7 @@ async fn rust_analyzer_proxy_falls_back_external() {
             [("PATH", &*extern_dir.display().to_string())],
         )
         .await
-        .extend_redactions([("[EXTERN_PATH]", &extern_path.display().to_string())])
+        .extend_redactions([("[EXTERN_PATH]", extern_path)])
         .with_stderr(snapbox::str![[r#"
 info: `rust-analyzer` is unavailable for the active toolchain
 info: falling back to "[EXTERN_PATH]"

tests/suite/cli_rustup.rs

@@ -1187,8 +1187,8 @@ async fn show_toolchain_toolchain_file_override_not_installed() {
         .expect_with_env(["rustup", "show"], [("RUSTUP_AUTO_INSTALL", "0")])
         .await
         .extend_redactions([
-            ("[RUSTUP_DIR]", &cx.config.rustupdir.to_string()),
-            ("[TOOLCHAIN_FILE]", &toolchain_file.display().to_string()),
+            ("[RUSTUP_DIR]", &cx.config.rustupdir.rustupdir),
+            ("[TOOLCHAIN_FILE]", &toolchain_file),
         ])
         .with_stdout(snapbox::str![[r#"
 Default host: [HOST_TRIPLE]
@@ -1676,7 +1676,7 @@ channel = "nightly"
     cx.config
         .expect(["rustup", "toolchain", "install"])
         .await
-        .extend_redactions([("[TOOLCHAIN_FILE]", &toolchain_file.display().to_string())])
+        .extend_redactions([("[TOOLCHAIN_FILE]", &toolchain_file)])
         .with_stderr(snapbox::str![[r#"
 info: syncing channel updates for 'nightly-[HOST_TRIPLE]'
 info: latest update on 2015-01-02, rust version 1.3.0 (hash-nightly-2)
@@ -1691,7 +1691,7 @@ info: it's active because: overridden by '[TOOLCHAIN_FILE]'
     cx.config
         .expect(["rustup", "toolchain", "install"])
         .await
-        .extend_redactions([("[TOOLCHAIN_FILE]", &toolchain_file.display().to_string())])
+        .extend_redactions([("[TOOLCHAIN_FILE]", &toolchain_file)])
         .with_stderr(snapbox::str![[r#"
 info: using existing install for 'nightly-[HOST_TRIPLE]'
 info: the active toolchain `nightly-[HOST_TRIPLE]` has been installed
@@ -3636,7 +3636,7 @@ async fn only_toml_in_rust_toolchain_toml() {
     cx.config
         .expect(["rustc", "--version"])
         .await
-        .extend_redactions([("[CWD]", &cwd.display().to_string())])
+        .extend_redactions([("[CWD]", &cwd)])
         .with_stderr(snapbox::str![[r#"
 ...
 error: could not parse override file: '[CWD]/rust-toolchain.toml'[..]
@@ -3658,7 +3658,7 @@ async fn warn_on_duplicate_rust_toolchain_file() {
     cx.config
         .expect(&["rustup", "toolchain", "install"])
         .await
-        .extend_redactions([("[CWD]", &cwd.canonicalize().unwrap().display().to_string())])
+        .extend_redactions([("[CWD]", &cwd.canonicalize().unwrap())])
         .with_stderr(snapbox::str![[r#"
 ...
 warn: both `[CWD]/rust-toolchain` and `[CWD]/rust-toolchain.toml` exist. Using `[CWD]/rust-toolchain`
@@ -3720,7 +3720,7 @@ profile = "minimal"
     cx.config
         .expect(&["rustup", "show", "active-toolchain"])
         .await
-        .extend_redactions([("[CWD]", &cwd.display().to_string())])
+        .extend_redactions([("[CWD]", &cwd)])
         .with_stdout(snapbox::str![[r#"
 my-custom (overridden by '[CWD]/rust-toolchain.toml')
 

tests/suite/cli_self_upd.rs

@@ -459,7 +459,7 @@ async fn update_but_not_installed() {
     cx.config
         .expect(["rustup", "self", "update"])
         .await
-        .extend_redactions([("[CARGO_DIR]", cx.config.cargodir.display().to_string())])
+        .extend_redactions([("[CARGO_DIR]", cx.config.cargodir)])
         .is_err()
         .with_stdout(snapbox::str![[""]])
         .with_stderr(snapbox::str![[r#"