From cbaee5df1b1e2b1f2d8a1072af9765fd2cca847d Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Fri, 6 Mar 2026 05:49:20 +0900 Subject: [PATCH] Tweak note condition --- compiler/rustc_lint/src/static_mut_refs.rs | 2 +- tests/ui/lint/static-mut-refs-interior-mutability.stderr | 3 +-- tests/ui/statics/static-lazy-init-with-arena-set.stderr | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler/rustc_lint/src/static_mut_refs.rs b/compiler/rustc_lint/src/static_mut_refs.rs index 64ab1f7535bf..1babe16b35a3 100644 --- a/compiler/rustc_lint/src/static_mut_refs.rs +++ b/compiler/rustc_lint/src/static_mut_refs.rs @@ -214,7 +214,7 @@ fn interior_mutability_suggestion( let sugg = static_mutability_span(cx, def_id).map(|span| StaticMutRefsInteriorMutabilitySugg { span }); - (true, sugg) + (sugg.is_none(), sugg) } fn static_mutability_span(cx: &LateContext<'_>, def_id: DefId) -> Option { diff --git a/tests/ui/lint/static-mut-refs-interior-mutability.stderr b/tests/ui/lint/static-mut-refs-interior-mutability.stderr index 5fe446cc27b2..29ab5a5c404d 100644 --- a/tests/ui/lint/static-mut-refs-interior-mutability.stderr +++ b/tests/ui/lint/static-mut-refs-interior-mutability.stderr @@ -4,9 +4,8 @@ error: creating a shared reference to mutable static LL | let _lock = unsafe { STDINOUT_MUTEX.lock().unwrap() }; | ^^^^^^^^^^^^^^^^^^^^^ shared reference to mutable static | - = note: for more information, see = note: shared references to mutable statics are dangerous; it's undefined behavior if the static is mutated or if a mutable reference is created for it while the shared reference lives - = help: use a type that relies on "interior mutability" instead; to read more on this, visit + = note: for more information, see = note: `#[deny(static_mut_refs)]` (part of `#[deny(rust_2024_compatibility)]`) on by default help: this type already provides "interior mutability", so its binding doesn't need to be declared as mutable | diff --git a/tests/ui/statics/static-lazy-init-with-arena-set.stderr b/tests/ui/statics/static-lazy-init-with-arena-set.stderr index c1d686171854..43b244607885 100644 --- a/tests/ui/statics/static-lazy-init-with-arena-set.stderr +++ b/tests/ui/statics/static-lazy-init-with-arena-set.stderr @@ -10,7 +10,6 @@ LL | | }); | |______________^ shared reference to mutable static | = note: shared references to mutable statics are dangerous; it's undefined behavior if the static is mutated or if a mutable reference is created for it while the shared reference lives - = help: use a type that relies on "interior mutability" instead; to read more on this, visit = note: for more information, see = note: `#[warn(static_mut_refs)]` (part of `#[warn(rust_2024_compatibility)]`) on by default help: this type already provides "interior mutability", so its binding doesn't need to be declared as mutable