Skip to content

Commit 6f630cf

Browse files
committed
style(test): qualify uses of snapbox::str![]
1 parent c5bc336 commit 6f630cf

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

tests/suite/cli_exact.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ use rustup::test::{
88
CROSS_ARCH1, CROSS_ARCH2, CliTestContext, MULTI_ARCH1, Scenario, this_host_triple,
99
};
1010
use rustup::utils::raw;
11-
use snapbox::str;
1211

1312
#[tokio::test]
1413
async fn update_once() {
@@ -323,7 +322,7 @@ async fn override_again() {
323322
.extend_redactions([("[CWD]", cx.config.current_dir().display().to_string())])
324323
.is_ok()
325324
.with_stdout("")
326-
.with_stderr(str![[r#"
325+
.with_stderr(snapbox::str![[r#"
327326
info: override toolchain for '[CWD]' set to 'nightly-[HOST_TRIPLE]'
328327
329328
"#]]);

tests/suite/cli_misc.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use rustup::test::{
1313
};
1414
use rustup::utils;
1515
use rustup::utils::raw::symlink_dir;
16-
use snapbox::str;
1716

1817
#[tokio::test]
1918
async fn smoke_test() {
@@ -119,7 +118,7 @@ async fn update_all_no_update_whitespace() {
119118
.expect(["rustup", "update", "nightly"])
120119
.await
121120
.is_ok()
122-
.with_stdout(str![[r#"
121+
.with_stdout(snapbox::str![[r#"
123122
124123
nightly-[HOST_TRIPLE] installed - 1.3.0 (hash-nightly-2)
125124

tests/suite/cli_self_upd.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use rustup::test::{
2222
use rustup::test::{RegistryGuard, RegistryValueId, USER_PATH};
2323
use rustup::utils::{self, raw};
2424
use rustup::{DUP_TOOLS, TOOLS, for_host};
25-
use snapbox::str;
2625
#[cfg(windows)]
2726
use windows_registry::Value;
2827

@@ -406,12 +405,12 @@ async fn update_precise() {
406405
("[TEST_VERSION]", TEST_VERSION),
407406
("[VERSION]", env!("CARGO_PKG_VERSION")),
408407
])
409-
.with_stdout(str![[r#"
408+
.with_stdout(snapbox::str![[r#"
410409
rustup updated - [VERSION] (from [VERSION])
411410
412411
413412
"#]])
414-
.with_stderr(str![[r#"
413+
.with_stderr(snapbox::str![[r#"
415414
info: checking for self-update (current version: [VERSION])
416415
info: `RUSTUP_VERSION` has been set to `[TEST_VERSION]`
417416
info: downloading self-update (new version: [TEST_VERSION])

tests/suite/cli_v1.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use std::fs;
77

88
use rustup::for_host;
99
use rustup::test::{CliTestContext, Scenario};
10-
use snapbox::str;
1110

1211
#[tokio::test]
1312
async fn rustc_no_default_toolchain() {
@@ -16,7 +15,7 @@ async fn rustc_no_default_toolchain() {
1615
.expect(["rustc"])
1716
.await
1817
.is_err()
19-
.with_stderr(str![[r#"
18+
.with_stderr(snapbox::str![[r#"
2019
error: rustup could not choose a version of rustc to run, because one wasn't specified explicitly, and no default is configured.
2120
help: run 'rustup default stable' to download the latest stable release of Rust and set it as your default toolchain.
2221

0 commit comments

Comments
 (0)