Skip to content

Commit ede97c6

Browse files
committed
Auto merge of rust-lang#3339 - RalfJung:remove-old-flags, r=saethlin
remove some flags that haven't had an effect in a while `@rust-lang/miri` any objections to this?
2 parents f47732b + 81fed2f commit ede97c6

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

src/tools/miri/src/bin/miri.rs

-11
Original file line numberDiff line numberDiff line change
@@ -402,11 +402,6 @@ fn main() {
402402
miri_config.check_alignment = miri::AlignmentCheck::None;
403403
} else if arg == "-Zmiri-symbolic-alignment-check" {
404404
miri_config.check_alignment = miri::AlignmentCheck::Symbolic;
405-
} else if arg == "-Zmiri-check-number-validity" {
406-
eprintln!(
407-
"WARNING: the flag `-Zmiri-check-number-validity` no longer has any effect \
408-
since it is now enabled by default"
409-
);
410405
} else if arg == "-Zmiri-disable-abi-check" {
411406
eprintln!(
412407
"WARNING: the flag `-Zmiri-disable-abi-check` is deprecated and planned to be removed.\n\
@@ -453,8 +448,6 @@ fn main() {
453448
miri_config.collect_leak_backtraces = false;
454449
} else if arg == "-Zmiri-panic-on-unsupported" {
455450
miri_config.panic_on_unsupported = true;
456-
} else if arg == "-Zmiri-tag-raw-pointers" {
457-
eprintln!("WARNING: `-Zmiri-tag-raw-pointers` has no effect; it is enabled by default");
458451
} else if arg == "-Zmiri-strict-provenance" {
459452
miri_config.provenance_mode = ProvenanceMode::Strict;
460453
} else if arg == "-Zmiri-permissive-provenance" {
@@ -470,10 +463,6 @@ fn main() {
470463
"scalar" => RetagFields::OnlyScalar,
471464
_ => show_error!("`-Zmiri-retag-fields` can only be `all`, `none`, or `scalar`"),
472465
};
473-
} else if arg == "-Zmiri-track-raw-pointers" {
474-
eprintln!(
475-
"WARNING: `-Zmiri-track-raw-pointers` has no effect; it is enabled by default"
476-
);
477466
} else if let Some(param) = arg.strip_prefix("-Zmiri-seed=") {
478467
if miri_config.seed.is_some() {
479468
show_error!("Cannot specify -Zmiri-seed multiple times!");

0 commit comments

Comments
 (0)