8000 Only emit one error per unsized binding, instead of one per usage by estebank · Pull Request #113183 · rust-lang/rust · GitHub
[go: up one dir, main page]
Skip to content

Only emit one error per unsized binding, instead of one per usage #113183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 27, 2023
Merged

Only emit one error per unsized binding, instead of one per usage #113183

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d86b8a
Add test for #56607
estebank Jun 30, 2023
2f79681
Only emit one error per unsized binding, instead of one per usage
estebank Jun 30, 2023
124d6d8
Remove need for `has_errors()` check
estebank Oct 9, 2023
568b316
Move predicate error early check to its own method
estebank Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove need for has_errors() check
  • Loading branch information
@estebank
estebank committed Oct 9, 2023
commit 124d6d843e1fc072ec2cd4547d60b61f99450738
19 changes: 12 additions & 7 deletions compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,6 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
predicate: error.obligation.predicate,
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
Expand Down Expand Up @@ -206,6 +200,18 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
for (error, suppressed) in iter::zip(&errors, &is_suppressed) {
if !suppressed && error.obligation.cause.span.from_expansion() == from_expansion {
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);
}
}
}
Expand Down Expand Up @@ -441,7 +447,6 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
&& let Some(Node::Pat(pat)) = self.tcx.hir().find(*hir_id)
&& let Some(preds) = self.reported_trait_errors.borrow().get(&pat.span)
&& preds.contains(&obligation.predicate)
&& self.tcx.sess.has_errors().is_some()
{
// Silence redundant errors on binding acccess that are already
// reported on the binding definition (#56607).
Expand Down
0