From 02f0bb7df1b1f9b83b8763a308e20cacf2463a65 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Tue, 5 Dec 2023 12:05:38 +0100 Subject: [PATCH 1/2] Don't explicitly warn against `semicolon_in_expressions_from_macros` This warns-by-default since 2 years and already has been added to the future-incompat group since Rust 1.68. See https://github.com/rust-lang/rust/issues/79813 for the tracking issue. --- src/tools/miri/miri-script/src/util.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri/miri-script/src/util.rs b/src/tools/miri/miri-script/src/util.rs index 64e780b61a7c7..d41eaecf20723 100644 --- a/src/tools/miri/miri-script/src/util.rs +++ b/src/tools/miri/miri-script/src/util.rs @@ -73,7 +73,7 @@ impl MiriEnv { flags.push("-C link-args=-Wl,-rpath,"); flags.push(libdir); // Enable rustc-specific lints (ignored without `-Zunstable-options`). - flags.push(" -Zunstable-options -Wrustc::internal -Wrust_2018_idioms -Wunused_lifetimes -Wsemicolon_in_expressions_from_macros"); + flags.push(" -Zunstable-options -Wrustc::internal -Wrust_2018_idioms -Wunused_lifetimes"); // Add user-defined flags. if let Some(value) = std::env::var_os("RUSTFLAGS") { flags.push(" "); From 02f96cc363ab2c7c8ddef26164598db46fcc6b7d Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Tue, 5 Dec 2023 12:18:25 +0100 Subject: [PATCH 2/2] Fix formatting --- src/tools/miri/miri-script/src/util.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/miri/miri-script/src/util.rs b/src/tools/miri/miri-script/src/util.rs index d41eaecf20723..c9bc55848dfb5 100644 --- a/src/tools/miri/miri-script/src/util.rs +++ b/src/tools/miri/miri-script/src/util.rs @@ -73,7 +73,9 @@ impl MiriEnv { flags.push("-C link-args=-Wl,-rpath,"); flags.push(libdir); // Enable rustc-specific lints (ignored without `-Zunstable-options`). - flags.push(" -Zunstable-options -Wrustc::internal -Wrust_2018_idioms -Wunused_lifetimes"); + flags.push( + " -Zunstable-options -Wrustc::internal -Wrust_2018_idioms -Wunused_lifetimes", + ); // Add user-defined flags. if let Some(value) = std::env::var_os("RUSTFLAGS") { flags.push(" ");