bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Rollup merge of #83634 - JohnTitor:proc-macro-ice, r=varkor

Browse source 
Do not emit the advanced diagnostics on macros

Fixes #83510
This commit is contained in:
Dylan DPC 2021-04-07 13:07:11 +02:00 • committed by GitHub
commit 2c55bacfbf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 71 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_resolve/src/late/diagnostics.rs
View file

@ -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;