diff --git a/src/test/clitools.rs b/src/test/clitools.rs index 5e9a98590e..276ef203e9 100644 --- a/src/test/clitools.rs +++ b/src/test/clitools.rs @@ -291,7 +291,7 @@ impl Config { /// specified by `args` under the default environment. #[must_use] pub async fn expect + Clone + Debug>(&self, args: impl AsRef<[S]>) -> Assert { - self.expect_with_env(args, &[]).await + self.expect_with_env(args, []).await } /// Returns an [`Assert`] object to check the output of running the command diff --git a/tests/suite/cli_rustup.rs b/tests/suite/cli_rustup.rs index 3f2f557b6a..407585a1d1 100644 --- a/tests/suite/cli_rustup.rs +++ b/tests/suite/cli_rustup.rs @@ -1327,7 +1327,7 @@ async fn show_toolchain_env() { .await .is_ok(); cx.config - .expect_with_env(["rustup", "show"], &[("RUSTUP_TOOLCHAIN", "nightly")]) + .expect_with_env(["rustup", "show"], [("RUSTUP_TOOLCHAIN", "nightly")]) .await .extend_redactions([("[RUSTUP_DIR]", &cx.config.rustupdir.to_string())]) .is_ok() @@ -1353,7 +1353,7 @@ installed targets: async fn show_toolchain_env_not_installed() { let cx = CliTestContext::new(Scenario::SimpleV2).await; cx.config - .expect_with_env(["rustup", "show"], &[("RUSTUP_TOOLCHAIN", "nightly")]) + .expect_with_env(["rustup", "show"], [("RUSTUP_TOOLCHAIN", "nightly")]) .await .extend_redactions([("[RUSTUP_DIR]", &cx.config.rustupdir.to_string())]) .is_ok() @@ -3027,7 +3027,7 @@ error: no active toolchain "show", "active-toolchain", ], - &[("RUSTUP_TOOLCHAIN", &**env_tc)], + [("RUSTUP_TOOLCHAIN", &**env_tc)], ) .await .extend_redactions([("[COMMAND_TC]", command_tc)]) diff --git a/tests/suite/cli_v2.rs b/tests/suite/cli_v2.rs index ee99048b6c..fb2ab7bdc2 100644 --- a/tests/suite/cli_v2.rs +++ b/tests/suite/cli_v2.rs @@ -543,7 +543,7 @@ async fn plus_override_toolchain_err_handling() { cx.config .expect_with_env( ["rustc", "+beta", "--version"], - &[("RUSTUP_AUTO_INSTALL", "0")], + [("RUSTUP_AUTO_INSTALL", "0")], ) .await .with_stderr(snapbox::str![[r#" @@ -1191,7 +1191,7 @@ async fn list_targets_no_toolchain() { cx.config .expect_with_env( ["rustup", "target", "list", "--toolchain=nightly"], - &[("RUSTUP_AUTO_INSTALL", "0")], + [("RUSTUP_AUTO_INSTALL", "0")], ) .await .with_stderr(snapbox::str![[r#" @@ -1221,7 +1221,7 @@ error: toolchain 'nightly-[HOST_TRIPLE]' is not installed cx.config .expect_with_env( ["rustup", "target", "list", "--toolchain=nightly"], - &[("RUSTUP_AUTO_INSTALL", "0")], + [("RUSTUP_AUTO_INSTALL", "0")], ) .await .with_stderr(snapbox::str![[r#" @@ -1234,7 +1234,7 @@ error: toolchain 'nightly-[HOST_TRIPLE]' is not installed cx.config .expect_with_env( ["rustup", "target", "list", "--toolchain=nightly"], - &[("RUSTUP_AUTO_INSTALL", "1")], + [("RUSTUP_AUTO_INSTALL", "1")], ) .await .is_ok(); @@ -1502,7 +1502,7 @@ async fn add_target_no_toolchain() { CROSS_ARCH1, "--toolchain=nightly", ], - &[("RUSTUP_AUTO_INSTALL", "0")], + [("RUSTUP_AUTO_INSTALL", "0")], ) .await .with_stderr(snapbox::str![[r#" @@ -1725,7 +1725,7 @@ async fn remove_target_no_toolchain() { CROSS_ARCH1, "--toolchain=nightly", ], - &[("RUSTUP_AUTO_INSTALL", "0")], + [("RUSTUP_AUTO_INSTALL", "0")], ) .await .with_stderr(snapbox::str![[r#"