bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove current_type_ascription from DiagnosticMetadata

Browse source
This commit is contained in:
yukang 2023-03-14 23:40:09 +08:00
parent f65b875e83
commit 10512b2932
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_resolve/src/late.rs
View file

@ -548,9 +548,6 @@ struct DiagnosticMetadata<'ast> {
/// they are used (in a `break` or `continue` statement) /// they are used (in a `break` or `continue` statement)
unused_labels: FxHashMap<NodeId, Span>, unused_labels: FxHashMap<NodeId, Span>,
/// Only used for better errors on `fn(): fn()`.
current_type_ascription: Vec<Span>,
/// Only used for better errors on `let x = { foo: bar };`. /// Only used for better errors on `let x = { foo: bar };`.
/// In the case of a parse error with `let x = { foo: bar, };`, this isn't needed, it's only /// In the case of a parse error with `let x = { foo: bar, };`, this isn't needed, it's only
/// needed for cases where this parses as a correct type ascription. /// needed for cases where this parses as a correct type ascription.
@ -4057,17 +4054,8 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
} }
} }
} }
ExprKind::Type(ref type_expr, ref ty) => { ExprKind::Type(ref _type_expr, ref _ty) => {
// `ParseSess::type_ascription_path_suggestions` keeps spans of colon tokens in
// type ascription. Here we are trying to retrieve the span of the colon token as
// well, but only if it's written without spaces `expr:Ty` and therefore confusable
// with `expr::Ty`, only in this case it will match the span from
// `type_ascription_path_suggestions`.
self.diagnostic_metadata
.current_type_ascription
.push(type_expr.span.between(ty.span));
visit::walk_expr(self, expr); visit::walk_expr(self, expr);
self.diagnostic_metadata.current_type_ascription.pop();
} }
// `async |x| ...` gets desugared to `|x| async {...}`, so we need to // `async |x| ...` gets desugared to `|x| async {...}`, so we need to
// resolve the arguments within the proper scopes so that usages of them inside the // resolve the arguments within the proper scopes so that usages of them inside the