rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Suggest removing label in 'label: non_block_expr

Browse Source
This commit is contained in:
Maybe Waffle
2022-06-05 23:34:11 +04:00
parent c6e5bb32fb
commit f06f051745
5 changed files with 67 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_parse/src/parser/expr.rs
View File

@@ -1557,6 +1557,8 @@ impl<'a> Parser<'a> {
// Continue as an expression in an effort to recover on `'label: non_block_expr`.
let expr = self.parse_expr().map(|expr| {
let span = expr.span;
let found_labeled_breaks = {
struct FindLabeledBreaksVisitor(bool);
@@ -1573,13 +1575,22 @@ impl<'a> Parser<'a> {
vis.0
};
// Suggestion involves adding a (as of time of writing this, unstable) labeled block
// so if the label is not used, just return the unmodified expression
// Suggestion involves adding a (as of time of writing this, unstable) labeled block.
//
// If there are no breaks that may use this label, suggest removing the label and
// recover to the unmodified expression.
if !found_labeled_breaks {
let msg = "consider removing the label";
err.span_suggestion_verbose(
lo.until(span),
msg,
"",
Applicability::MachineApplicable,
);
return expr;
}
let span = expr.span;
let sugg_msg = "consider enclosing expression in a block";
let suggestions = vec![
(span.shrink_to_lo(), "{".to_owned()),