bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #80023 - sasurau4:feature/enhance-error-message-when-wrongly-written-broken-label, r=lcnr

Browse source 
Enhance error message when misspelled label to value in break expression

Fix #79424
This commit is contained in:
Dylan DPC 2020-12-18 00:30:18 +01:00 • committed by GitHub
commit a4b95ee517
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 113 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -542,6 +542,26 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_label(base_span, fallback_label);
}
}
if let Some(err_code) = &err.code {
if err_code == &rustc_errors::error_code!(E0425) {
for label_rib in &self.label_ribs {
for (label_ident, _) in &label_rib.bindings {
if format!("'{}", ident) == label_ident.to_string() {
let msg = "a label with a similar name exists";
// FIXME: consider only emitting this suggestion if a label would be valid here
// which is pretty much only the case for `break` expressions.
err.span_suggestion(
span,
&msg,
label_ident.name.to_string(),
Applicability::MaybeIncorrect,
);
}
}
}
}
}
(err, candidates)
}