From 98e20c097cbb402ee2c6f4056fe8b4acca9679f9 Mon Sep 17 00:00:00 2001 From: yukang Date: Thu, 15 Sep 2022 15:18:23 +0800 Subject: [PATCH 1/2] fix #101797: Suggest associated const for incorrect use of let in traits --- compiler/rustc_parse/src/parser/item.rs | 19 +++++++++++++++---- src/test/ui/parser/suggest-assoc-const.fixed | 10 ++++++++++ src/test/ui/parser/suggest-assoc-const.rs | 10 ++++++++++ src/test/ui/parser/suggest-assoc-const.stderr | 8 ++++++++ 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 src/test/ui/parser/suggest-assoc-const.fixed create mode 100644 src/test/ui/parser/suggest-assoc-const.rs create mode 100644 src/test/ui/parser/suggest-assoc-const.stderr diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs index b190a7062defd..045dc7357f177 100644 --- a/compiler/rustc_parse/src/parser/item.rs +++ b/compiler/rustc_parse/src/parser/item.rs @@ -698,11 +698,22 @@ impl<'a> Parser<'a> { let semicolon_span = self.token.span; // We have to bail or we'll potentially never make progress. let non_item_span = self.token.span; - self.consume_block(Delimiter::Brace, ConsumeClosingDelim::Yes); + let is_let = self.token.is_keyword(kw::Let); + let mut err = self.struct_span_err(non_item_span, "non-item in item list"); - err.span_label(open_brace_span, "item list starts here") - .span_label(non_item_span, "non-item starts here") - .span_label(self.prev_token.span, "item list ends here"); + self.consume_block(Delimiter::Brace, ConsumeClosingDelim::Yes); + if is_let { + err.span_suggestion( + non_item_span, + "considering use `const` instead of `let` for associated const", + "const", + Applicability::MachineApplicable, + ); + } else { + err.span_label(open_brace_span, "item list starts here") + .span_label(non_item_span, "non-item starts here") + .span_label(self.prev_token.span, "item list ends here"); + } if is_unnecessary_semicolon { err.span_suggestion( semicolon_span, diff --git a/src/test/ui/parser/suggest-assoc-const.fixed b/src/test/ui/parser/suggest-assoc-const.fixed new file mode 100644 index 0000000000000..259f37b23a584 --- /dev/null +++ b/src/test/ui/parser/suggest-assoc-const.fixed @@ -0,0 +1,10 @@ +// Issue: 101797, Suggest associated const for incorrect use of let in traits +// run-rustfix +trait Trait { + const _X: i32; + //~^ ERROR non-item in item list +} + +fn main() { + +} diff --git a/src/test/ui/parser/suggest-assoc-const.rs b/src/test/ui/parser/suggest-assoc-const.rs new file mode 100644 index 0000000000000..c7be712ec076e --- /dev/null +++ b/src/test/ui/parser/suggest-assoc-const.rs @@ -0,0 +1,10 @@ +// Issue: 101797, Suggest associated const for incorrect use of let in traits +// run-rustfix +trait Trait { + let _X: i32; + //~^ ERROR non-item in item list +} + +fn main() { + +} diff --git a/src/test/ui/parser/suggest-assoc-const.stderr b/src/test/ui/parser/suggest-assoc-const.stderr new file mode 100644 index 0000000000000..b92e399c90542 --- /dev/null +++ b/src/test/ui/parser/suggest-assoc-const.stderr @@ -0,0 +1,8 @@ +error: non-item in item list + --> $DIR/suggest-assoc-const.rs:4:5 + | +LL | let _X: i32; + | ^^^ help: considering use `const` instead of `let` for associated const: `const` + +error: aborting due to previous error + From 4bf7d2ca913179e3d4c71871a112820624c1e379 Mon Sep 17 00:00:00 2001 From: yukang Date: Fri, 16 Sep 2022 01:09:26 +0800 Subject: [PATCH 2/2] tweak suggestion --- compiler/rustc_parse/src/parser/item.rs | 2 +- src/test/ui/parser/suggest-assoc-const.stderr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs index 045dc7357f177..e55b5ce71cded 100644 --- a/compiler/rustc_parse/src/parser/item.rs +++ b/compiler/rustc_parse/src/parser/item.rs @@ -705,7 +705,7 @@ impl<'a> Parser<'a> { if is_let { err.span_suggestion( non_item_span, - "considering use `const` instead of `let` for associated const", + "consider using `const` instead of `let` for associated const", "const", Applicability::MachineApplicable, ); diff --git a/src/test/ui/parser/suggest-assoc-const.stderr b/src/test/ui/parser/suggest-assoc-const.stderr index b92e399c90542..2ddfa07c5be47 100644 --- a/src/test/ui/parser/suggest-assoc-const.stderr +++ b/src/test/ui/parser/suggest-assoc-const.stderr @@ -2,7 +2,7 @@ error: non-item in item list --> $DIR/suggest-assoc-const.rs:4:5 | LL | let _X: i32; - | ^^^ help: considering use `const` instead of `let` for associated const: `const` + | ^^^ help: consider using `const` instead of `let` for associated const: `const` error: aborting due to previous error