about summary refs log tree commit diff
path: root/compiler/rustc_resolve/src
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2021-04-07 13:07:11 +0200
committerGitHub <noreply@github.com>2021-04-07 13:07:11 +0200
commit2c55bacfbf5bfdf3f38a21cbda41bd8a3439fdd6 (patch)
tree4a766d352410194e3de77e1172e42182d84ae7be /compiler/rustc_resolve/src
parent505846ec07c1303369358a1c3358c7d7ee0ca12e (diff)
parent960b6992d60aa21ed5d3c5f4eabe20ad3acc77d2 (diff)
downloadrust-2c55bacfbf5bfdf3f38a21cbda41bd8a3439fdd6.tar.gz
rust-2c55bacfbf5bfdf3f38a21cbda41bd8a3439fdd6.zip
Rollup merge of #83634 - JohnTitor:proc-macro-ice, r=varkor
Do not emit the advanced diagnostics on macros

Fixes #83510
Diffstat (limited to 'compiler/rustc_resolve/src')
-rw-r--r--compiler/rustc_resolve/src/late/diagnostics.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
index 1fb07bdae9d..6fae6921fc9 100644
--- a/compiler/rustc_resolve/src/late/diagnostics.rs
+++ b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -456,12 +456,14 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
             }
         }
 
+        let is_macro = base_span.from_expansion() && base_span.desugaring_kind().is_none();
         if !self.type_ascription_suggestion(&mut err, base_span) {
             let mut fallback = false;
             if let (
                 PathSource::Trait(AliasPossibility::Maybe),
                 Some(Res::Def(DefKind::Struct | DefKind::Enum | DefKind::Union, _)),
-            ) = (source, res)
+                false,
+            ) = (source, res, is_macro)
             {
                 if let Some(bounds @ [_, .., _]) = self.diagnostic_metadata.current_trait_object {
                     fallback = true;