diff options
| author | Michael Goulet <michael@errs.io> | 2024-03-20 18:22:21 -0400 |
|---|---|---|
| committer | Michael Goulet <michael@errs.io> | 2024-03-21 11:42:49 -0400 |
| commit | a4db3ffdcbce5e43c1ba47277719fecd0dd53b63 (patch) | |
| tree | b1008d97af6b0387aca9a498e1b552748b8991e5 | |
| parent | 2d633317f30dd02895f167b65dc1feeee0d08265 (diff) | |
| download | rust-a4db3ffdcbce5e43c1ba47277719fecd0dd53b63.tar.gz rust-a4db3ffdcbce5e43c1ba47277719fecd0dd53b63.zip | |
Don't suggest deref macro since it's unstable
| -rw-r--r-- | compiler/rustc_resolve/src/late/diagnostics.rs | 7 | ||||
| -rw-r--r-- | tests/ui/unboxed-closures/unboxed-closures-type-mismatch-closure-from-another-scope.stderr | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs index 1b8f2fc005c..bb4294fbcfb 100644 --- a/compiler/rustc_resolve/src/late/diagnostics.rs +++ b/compiler/rustc_resolve/src/late/diagnostics.rs @@ -1592,18 +1592,23 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> { match (res, source) { ( - Res::Def(DefKind::Macro(MacroKind::Bang), _), + Res::Def(DefKind::Macro(MacroKind::Bang), def_id), PathSource::Expr(Some(Expr { kind: ExprKind::Index(..) | ExprKind::Call(..), .. })) | PathSource::Struct, ) => { + // Don't suggest macro if it's unstable. + let suggestable = def_id.is_local() + || self.r.tcx.lookup_stability(def_id).map_or(true, |s| s.is_stable()); + err.span_label(span, fallback_label.to_string()); // Don't suggest `!` for a macro invocation if there are generic args if path .last() .is_some_and(|segment| !segment.has_generic_args && !segment.has_lifetime_args) + && suggestable { err.span_suggestion_verbose( span.shrink_to_hi(), diff --git a/tests/ui/unboxed-closures/unboxed-closures-type-mismatch-closure-from-another-scope.stderr b/tests/ui/unboxed-closures/unboxed-closures-type-mismatch-closure-from-another-scope.stderr index 394186fafe4..5f22c781345 100644 --- a/tests/ui/unboxed-closures/unboxed-closures-type-mismatch-closure-from-another-scope.stderr +++ b/tests/ui/unboxed-closures/unboxed-closures-type-mismatch-closure-from-another-scope.stderr @@ -32,10 +32,6 @@ error[E0423]: expected function, found macro `deref` LL | deref(p); | ^^^^^ not a function | -help: use `!` to invoke the macro - | -LL | deref!(p); - | + help: use the `.` operator to call the method `Deref::deref` on `&&()` | LL - deref(p); |