Skip to content

Commit 56e0df6

Browse files
committed
Auto merge of #9148 - bjorn3:fix_ci, r=ehuss
Fix warnings of the new non_fmt_panic lint This fixes the CI failure since the latest nightly. See rust-lang/rust#81645
2 parents 90b6fa8 + f5a3d55 commit 56e0df6

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

crates/cargo-test-support/src/cross_compile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ rustup does not appear to be installed. Make sure that the appropriate
177177
},
178178
}
179179

180-
panic!(message);
180+
panic!("{}", message);
181181
}
182182

183183
/// The alternate target-triple to build with.

tests/testsuite/cargo_command.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,5 +365,5 @@ fn closed_output_ok() {
365365
.unwrap();
366366
let status = child.wait().unwrap();
367367
assert!(status.success());
368-
assert!(s.is_empty(), s);
368+
assert!(s.is_empty(), "{}", s);
369369
}

tests/testsuite/new.rs

+11-3
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,11 @@ fn finds_git_author() {
370370

371371
let toml = paths::root().join("foo/Cargo.toml");
372372
let contents = fs::read_to_string(&toml).unwrap();
373-
assert!(contents.contains(r#"authors = ["foo <gitfoo>"]"#), contents);
373+
assert!(
374+
contents.contains(r#"authors = ["foo <gitfoo>"]"#),
375+
"{}",
376+
contents
377+
);
374378
}
375379

376380
#[cargo_test]
@@ -411,7 +415,11 @@ fn finds_git_author_in_included_config() {
411415
cargo_process("new foo/bar").run();
412416
let toml = paths::root().join("foo/bar/Cargo.toml");
413417
let contents = fs::read_to_string(&toml).unwrap();
414-
assert!(contents.contains(r#"authors = ["foo <bar>"]"#), contents,);
418+
assert!(
419+
contents.contains(r#"authors = ["foo <bar>"]"#),
420+
"{}",
421+
contents
422+
);
415423
}
416424

417425
#[cargo_test]
@@ -632,7 +640,7 @@ fn new_with_blank_email() {
632640
.run();
633641

634642
let contents = fs::read_to_string(paths::root().join("foo/Cargo.toml")).unwrap();
635-
assert!(contents.contains(r#"authors = ["Sen"]"#), contents);
643+
assert!(contents.contains(r#"authors = ["Sen"]"#), "{}", contents);
636644
}
637645

638646
#[cargo_test]

0 commit comments

Comments
 (0)