mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove need for has_errors() check

Browse Source
This commit is contained in:
Esteban Küber 2023-10-09 23:14:23 +00:00
parent 2f79681fb9
commit 124d6d843e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs
View File

@ -163,12 +163,6 @@ struct ErrorDescriptor<'tcx> {
predicate: error.obligation.predicate, predicate: error.obligation.predicate,
index: Some(index), index: Some(index),
}); });
self.reported_trait_errors
.borrow_mut()
.entry(span)
.or_default()
.push(error.obligation.predicate);
} }
// We do this in 2 passes because we want to display errors in order, though // We do this in 2 passes because we want to display errors in order, though
@ -206,6 +200,18 @@ struct ErrorDescriptor<'tcx> {
for (error, suppressed) in iter::zip(&errors, &is_suppressed) { for (error, suppressed) in iter::zip(&errors, &is_suppressed) {
if !suppressed && error.obligation.cause.span.from_expansion() == from_expansion { if !suppressed && error.obligation.cause.span.from_expansion() == from_expansion {
self.report_fulfillment_error(error); self.report_fulfillment_error(error);
// We want to ignore desugarings here: spans are equivalent even
// if one is the result of a desugaring and the other is not.
let mut span = error.obligation.cause.span;
let expn_data = span.ctxt().outer_expn_data();
if let ExpnKind::Desugaring(_) = expn_data.kind {
span = expn_data.call_site;
}
self.reported_trait_errors
.borrow_mut()
.entry(span)
.or_default()
.push(error.obligation.predicate);
} }
} }
} }
@ -441,7 +447,6 @@ fn report_selection_error(
&& let Some(Node::Pat(pat)) = self.tcx.hir().find(*hir_id) && let Some(Node::Pat(pat)) = self.tcx.hir().find(*hir_id)
&& let Some(preds) = self.reported_trait_errors.borrow().get(&pat.span) && let Some(preds) = self.reported_trait_errors.borrow().get(&pat.span)
&& preds.contains(&obligation.predicate) && preds.contains(&obligation.predicate)
&& self.tcx.sess.has_errors().is_some()
{ {
// Silence redundant errors on binding acccess that are already // Silence redundant errors on binding acccess that are already
// reported on the binding definition (#56607). // reported on the binding definition (#56607).