Auto merge of #148577 - WaffleLapkin:unmustuse_in_always_ok, r=<try>

rust-bors[bot] · web-flow · commit 4f260f0f20b3 · 2025-11-06T13:26:23.000Z
[DO NOT MERGE] crater proposed changes in unused must use lint
diff --git a/compiler/rustc_lint/src/unused.rs b/compiler/rustc_lint/src/unused.rs
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs
@@ -82,6 +82,7 @@
 #![warn(rustdoc::unescaped_backticks)]
 #![deny(ffi_unwind_calls)]
 #![warn(unreachable_pub)]
+#![expect(unmustuse_in_always_ok)]
 //
 // Library features:
 // tidy-alphabetical-start
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
@@ -89,6 +89,7 @@
 #![allow(internal_features)]
 #![deny(ffi_unwind_calls)]
 #![warn(unreachable_pub)]
+#![expect(unmustuse_in_always_ok)]
 // Do not check link redundancy on bootstrapping phase
 #![allow(rustdoc::redundant_explicit_links)]
 #![warn(rustdoc::unescaped_backticks)]
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs
@@ -249,6 +249,7 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 #![allow(rustdoc::redundant_explicit_links)]
 #![warn(rustdoc::unescaped_backticks)]
+#![expect(unmustuse_in_always_ok)]
 // Ensure that std can be linked against panic_abort despite compiled with `-C panic=unwind`
 #![deny(ffi_unwind_calls)]
 // std may use features in a platform-specific way
diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
@@ -1169,6 +1169,10 @@ impl Builder<'_> {
         // Lints just for `compiler/` crates.
         if mode == Mode::Rustc {
             lint_flags.push("-Wrustc::internal");
+            if compiler.stage > 0 {
+                lint_flags.push("-Aunmustuse_in_always_ok");
+                lint_flags.push("-Amustuse_in_always_ok");
+            }
             lint_flags.push("-Drustc::symbol_intern_string_literal");
             // FIXME(edition_2024): Change this to `-Wrust_2024_idioms` when all
             // of the individual lints are satisfied.
diff --git a/tests/ui/binding/empty-types-in-patterns.rs b/tests/ui/binding/empty-types-in-patterns.rs
@@ -5,7 +5,7 @@
 
 #![allow(unreachable_patterns)]
 #![allow(unreachable_code)]
-#![allow(unused_variables)]
+#![expect(unused_variables, unmustuse_in_always_ok)]
 
 #[allow(dead_code)]
 fn foo(z: !) {
diff --git a/tests/ui/lint/unused/must_use-result-unit-uninhabited.rs b/tests/ui/lint/unused/must_use-result-unit-uninhabited.rs
@@ -3,10 +3,15 @@
 
 #![deny(unused_must_use)]
 #![feature(never_type)]
-
+#![expect(unmustuse_in_always_ok, mustuse_in_always_ok)]
 use core::ops::{ControlFlow, ControlFlow::Continue};
 use dep::{MyUninhabited, MyUninhabitedNonexhaustive};
 
+#[must_use]
+struct MustUse;
+
+struct Struct;
+
 fn result_unit_unit() -> Result<(), ()> {
     Ok(())
 }
@@ -19,6 +24,14 @@ fn result_unit_never() -> Result<(), !> {
     Ok(())
 }
 
+fn result_struct_never() -> Result<Struct, !> {
+    Ok(Struct)
+}
+
+fn result_must_use_never() -> Result<MustUse, !> {
+    Ok(MustUse)
+}
+
 fn result_unit_myuninhabited() -> Result<(), MyUninhabited> {
     Ok(())
 }
@@ -80,6 +93,8 @@ fn main() {
     result_unit_unit(); //~ ERROR: unused `Result` that must be used
     result_unit_infallible();
     result_unit_never();
+    result_must_use_never(); //~ ERROR: unused `MustUse` in a `Result` with an uninhabited error that must be used
+    result_struct_never();
     result_unit_myuninhabited();
     result_unit_myuninhabited_nonexhaustive(); //~ ERROR: unused `Result` that must be used
     result_unit_assoctype(S1);
diff --git a/tests/ui/lint/unused/must_use-result-unit-uninhabited.stderr b/tests/ui/lint/unused/must_use-result-unit-uninhabited.stderr
@@ -1,5 +1,5 @@
 error: unused `Result` that must be used
-  --> $DIR/must_use-result-unit-uninhabited.rs:80:5
+  --> $DIR/must_use-result-unit-uninhabited.rs:93:5
    |
 LL |     result_unit_unit();
    |     ^^^^^^^^^^^^^^^^^^
@@ -15,8 +15,14 @@ help: use `let _ = ...` to ignore the resulting value
 LL |     let _ = result_unit_unit();
    |     +++++++
 
+error: unused `MustUse` in a `Result` with an uninhabited error that must be used
+  --> $DIR/must_use-result-unit-uninhabited.rs:96:5
+   |
+LL |     result_must_use_never();
+   |     ^^^^^^^^^^^^^^^^^^^^^^^
+
 error: unused `Result` that must be used
-  --> $DIR/must_use-result-unit-uninhabited.rs:84:5
+  --> $DIR/must_use-result-unit-uninhabited.rs:99:5
    |
 LL |     result_unit_myuninhabited_nonexhaustive();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -28,7 +34,7 @@ LL |     let _ = result_unit_myuninhabited_nonexhaustive();
    |     +++++++
 
 error: unused `Result` that must be used
-  --> $DIR/must_use-result-unit-uninhabited.rs:86:5
+  --> $DIR/must_use-result-unit-uninhabited.rs:101:5
    |
 LL |     result_unit_assoctype(S2);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -40,7 +46,7 @@ LL |     let _ = result_unit_assoctype(S2);
    |     +++++++
 
 error: unused `Result` that must be used
-  --> $DIR/must_use-result-unit-uninhabited.rs:88:5
+  --> $DIR/must_use-result-unit-uninhabited.rs:103:5
    |
 LL |     S2.method_use_assoc_type();
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -52,7 +58,7 @@ LL |     let _ = S2.method_use_assoc_type();
    |     +++++++
 
 error: unused `ControlFlow` that must be used
-  --> $DIR/must_use-result-unit-uninhabited.rs:90:5
+  --> $DIR/must_use-result-unit-uninhabited.rs:105:5
    |
 LL |     controlflow_unit();
    |     ^^^^^^^^^^^^^^^^^^
@@ -63,7 +69,7 @@ LL |     let _ = controlflow_unit();
    |     +++++++
 
 error: unused `Result` that must be used
-  --> $DIR/must_use-result-unit-uninhabited.rs:99:9
+  --> $DIR/must_use-result-unit-uninhabited.rs:114:9
    |
 LL |         self.generate();
    |         ^^^^^^^^^^^^^^^
@@ -74,5 +80,5 @@ help: use `let _ = ...` to ignore the resulting value
 LL |         let _ = self.generate();
    |         +++++++
 
-error: aborting due to 6 previous errors
+error: aborting due to 7 previous errors
 
diff --git a/tests/ui/lint/use-redundant/use-redundant-prelude-rust-2015.rs b/tests/ui/lint/use-redundant/use-redundant-prelude-rust-2015.rs
@@ -1,7 +1,7 @@
 //@ edition: 2015
 //@ check-pass
 #![warn(redundant_imports)]
-
+#![expect(unmustuse_in_always_ok)]
 
 use std::option::Option::Some;//~ WARNING the item `Some` is imported redundantly
 use std::option::Option::None; //~ WARNING the item `None` is imported redundantly
diff --git a/tests/ui/lint/use-redundant/use-redundant-prelude-rust-2021.rs b/tests/ui/lint/use-redundant/use-redundant-prelude-rust-2021.rs
@@ -1,7 +1,7 @@
 //@ check-pass
 //@ edition:2021
 #![warn(redundant_imports)]
-
+#![expect(unmustuse_in_always_ok)]
 use std::convert::TryFrom;//~ WARNING the item `TryFrom` is imported redundantly
 use std::convert::TryInto;//~ WARNING the item `TryInto` is imported redundantly
 
diff --git a/tests/ui/never_type/never-result.rs b/tests/ui/never_type/never-result.rs
@@ -5,7 +5,7 @@
 #![allow(unreachable_patterns)]
 // Test that we can extract a ! through pattern matching then use it as several different types.
 #![feature(never_type)]
-
+#![expect(unmustuse_in_always_ok)]
 fn main() {
     let x: Result<u32, !> = Ok(123);
     match x {
diff --git a/tests/ui/never_type/never-type-rvalues.rs b/tests/ui/never_type/never-type-rvalues.rs
@@ -4,7 +4,7 @@
 #![allow(dead_code)]
 #![allow(path_statements)]
 #![allow(unreachable_patterns)]
-
+#![expect(unmustuse_in_always_ok)]
 fn never_direct(x: !) {
     x;
 }
diff --git a/tests/ui/never_type/question_mark_from_never.rs b/tests/ui/never_type/question_mark_from_never.rs
@@ -4,7 +4,7 @@
 //
 //@ revisions: unit never
 //@ check-pass
-#![allow(internal_features)]
+#![expect(internal_features, unmustuse_in_always_ok)]
 #![feature(rustc_attrs, never_type)]
 #![cfg_attr(unit, rustc_never_type_options(fallback = "unit"))]
 #![cfg_attr(never, rustc_never_type_options(fallback = "never"))]
diff --git a/tests/ui/never_type/try_from.rs b/tests/ui/never_type/try_from.rs
@@ -6,7 +6,7 @@
 // over `TryFrom` being blanket impl for all `T: From`
 
 #![feature(never_type)]
-
+#![expect(unmustuse_in_always_ok)]
 use std::convert::{TryInto, Infallible};
 
 struct Foo<T> {
diff --git a/tests/ui/pattern/usefulness/explain-unreachable-pats.rs b/tests/ui/pattern/usefulness/explain-unreachable-pats.rs
@@ -2,7 +2,7 @@
 #![feature(exhaustive_patterns)]
 #![deny(unreachable_patterns)]
 //~^ NOTE lint level is defined here
-
+#![expect(unmustuse_in_always_ok)]
 #[rustfmt::skip]
 fn main() {
     match (0u8,) {
diff --git a/tests/ui/pattern/usefulness/rustfix-unreachable-pattern.fixed b/tests/ui/pattern/usefulness/rustfix-unreachable-pattern.fixed
@@ -1,7 +1,7 @@
 //@ run-rustfix
 #![feature(never_patterns)]
 #![feature(exhaustive_patterns)]
-#![allow(incomplete_features)]
+#![expect(incomplete_features, unmustuse_in_always_ok)]
 #![deny(unreachable_patterns)]
 
 enum Void {}
diff --git a/tests/ui/pattern/usefulness/rustfix-unreachable-pattern.rs b/tests/ui/pattern/usefulness/rustfix-unreachable-pattern.rs
@@ -1,7 +1,7 @@
 //@ run-rustfix
 #![feature(never_patterns)]
 #![feature(exhaustive_patterns)]
-#![allow(incomplete_features)]
+#![expect(incomplete_features, unmustuse_in_always_ok)]
 #![deny(unreachable_patterns)]
 
 enum Void {}
diff --git a/tests/ui/print_type_sizes/uninhabited.rs b/tests/ui/print_type_sizes/uninhabited.rs
@@ -3,7 +3,7 @@
 //@ ignore-pass
 // ^-- needed because `--pass check` does not emit the output needed.
 //     FIXME: consider using an attribute instead of side-effects.
-
+#![expect(unmustuse_in_always_ok)]
 #![feature(never_type)]
 
 pub fn test() {
diff --git a/tests/ui/reachable/unreachable-try-pattern.rs b/tests/ui/reachable/unreachable-try-pattern.rs
@@ -2,6 +2,7 @@
 #![feature(never_type, exhaustive_patterns)]
 #![warn(unreachable_code)]
 #![warn(unreachable_patterns)]
+#![expect(unmustuse_in_always_ok)]
 
 enum Void {}
 
diff --git a/tests/ui/reachable/unreachable-try-pattern.stderr b/tests/ui/reachable/unreachable-try-pattern.stderr
@@ -1,5 +1,5 @@
 warning: unreachable call
-  --> $DIR/unreachable-try-pattern.rs:19:33
+  --> $DIR/unreachable-try-pattern.rs:20:33
    |
 LL |     let y = (match x { Ok(n) => Ok(n as u32), Err(e) => Err(e) })?;
    |                                 ^^ - any code following this expression is unreachable
@@ -13,7 +13,7 @@ LL | #![warn(unreachable_code)]
    |         ^^^^^^^^^^^^^^^^
 
 warning: unreachable pattern
-  --> $DIR/unreachable-try-pattern.rs:19:24
+  --> $DIR/unreachable-try-pattern.rs:20:24
    |
 LL |     let y = (match x { Ok(n) => Ok(n as u32), Err(e) => Err(e) })?;
    |                        ^^^^^-----------------
@@ -29,7 +29,7 @@ LL | #![warn(unreachable_patterns)]
    |         ^^^^^^^^^^^^^^^^^^^^
 
 warning: unreachable pattern
-  --> $DIR/unreachable-try-pattern.rs:30:40
+  --> $DIR/unreachable-try-pattern.rs:31:40
    |
 LL |     let y = (match x { Ok(n) => Ok(n), Err(e) => Err(e) })?;
    |                                        ^^^^^^----------
diff --git a/tests/ui/rfcs/rfc-0000-never_patterns/unreachable.rs b/tests/ui/rfcs/rfc-0000-never_patterns/unreachable.rs
@@ -1,6 +1,6 @@
 #![feature(exhaustive_patterns)]
 #![feature(never_patterns)]
-#![allow(incomplete_features)]
+#![expect(incomplete_features, unmustuse_in_always_ok)]
 #![allow(dead_code, unreachable_code)]
 #![deny(unreachable_patterns)]
 
diff --git a/tests/ui/rfcs/rfc-0000-never_patterns/use-bindings.rs b/tests/ui/rfcs/rfc-0000-never_patterns/use-bindings.rs
@@ -1,6 +1,6 @@
 //@ check-pass
 #![feature(never_patterns)]
-#![allow(incomplete_features)]
+#![expect(incomplete_features, unmustuse_in_always_ok)]
 
 #[derive(Copy, Clone)]
 enum Void {}
diff --git a/tests/ui/traits/const-traits/const-drop.rs b/tests/ui/traits/const-traits/const-drop.rs
@@ -5,6 +5,7 @@
 #![feature(const_trait_impl, const_destruct)]
 #![feature(never_type)]
 #![cfg_attr(precise, feature(const_precise_live_drops))]
+#![expect(unmustuse_in_always_ok)]
 
 use std::marker::Destruct;
 
