From e49866a5c778b6ebe17324369604c3b448c88a4b 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. --- miri-script/src/util.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miri-script/src/util.rs b/miri-script/src/util.rs index 64e780b61a..d41eaecf20 100644 --- a/miri-script/src/util.rs +++ b/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 dc32d58b46269d37785a6aac9805b6005a13fefc 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 --- miri-script/src/util.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/miri-script/src/util.rs b/miri-script/src/util.rs index d41eaecf20..c9bc55848d 100644 --- a/miri-script/src/util.rs +++ b/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(" ");