Skip to content

Commit 7af1d46

Browse files
committed
Auto merge of #3087 - rust-lang:rustup-2023-09-27, r=RalfJung
Automatic sync from rustc
2 parents 1a82975 + b77aad7 commit 7af1d46

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cargo-miri/src/phases.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc_version::VersionMeta;
1010

1111
use crate::{setup::*, util::*};
1212

13-
const CARGO_MIRI_HELP: &str = r#"Runs binary crates and tests in Miri
13+
const CARGO_MIRI_HELP: &str = r"Runs binary crates and tests in Miri
1414
1515
Usage:
1616
cargo miri [subcommand] [<cargo options>...] [--] [<program/test suite options>...]
@@ -31,7 +31,7 @@ Examples:
3131
This will print the path to the generated sysroot (and nothing else) on stdout.
3232
stderr will still contain progress information about how the build is doing.
3333
34-
"#;
34+
";
3535

3636
fn show_help() {
3737
println!("{CARGO_MIRI_HELP}");

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
42ca6e4e5760a548a6fa858482de6d237f6fb3b8
1+
d206f2c0857eb879877f27508139dd62a40294c3

0 commit comments

Comments
 (0)