Rollup merge of #133143 - kornelski:let-mut-global, r=compiler-errors
Diagnostics for let mut in item context The diagnostics for `let` at the top level did not account for `let mut`, which [made the error unclear](https://users.rust-lang.org/t/create-a-vector-of-constants-outside-main/121251/1). I've made the diagnostic always display a link to valid items. I've added dedicated help for `let mut` case that suggests using a `Mutex` (to steer novice users away from the `static mut` trap). Unfortunately, neither the Rust book, nor libstd docs have dedicated section listing all other types for interior-mutable `static`s.
This commit is contained in:
commit
6c4a7b6ff3
4 changed files with 47 additions and 9 deletions
|
@ -77,18 +77,35 @@ impl<'a> Parser<'a> {
|
|||
if !self.eat(term) {
|
||||
let token_str = super::token_descr(&self.token);
|
||||
if !self.maybe_consume_incorrect_semicolon(items.last().map(|x| &**x)) {
|
||||
let is_let = self.token.is_keyword(kw::Let);
|
||||
let is_let_mut = is_let && self.look_ahead(1, |t| t.is_keyword(kw::Mut));
|
||||
let let_has_ident = is_let && !is_let_mut && self.is_kw_followed_by_ident(kw::Let);
|
||||
|
||||
let msg = format!("expected item, found {token_str}");
|
||||
let mut err = self.dcx().struct_span_err(self.token.span, msg);
|
||||
let span = self.token.span;
|
||||
if self.is_kw_followed_by_ident(kw::Let) {
|
||||
err.span_label(
|
||||
span,
|
||||
"consider using `const` or `static` instead of `let` for global variables",
|
||||
);
|
||||
|
||||
let label = if is_let {
|
||||
"`let` cannot be used for global variables"
|
||||
} else {
|
||||
err.span_label(span, "expected item")
|
||||
.note("for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>");
|
||||
"expected item"
|
||||
};
|
||||
err.span_label(self.token.span, label);
|
||||
|
||||
if is_let {
|
||||
if is_let_mut {
|
||||
err.help("consider using `static` and a `Mutex` instead of `let mut`");
|
||||
} else if let_has_ident {
|
||||
err.span_suggestion_short(
|
||||
self.token.span,
|
||||
"consider using `static` or `const` instead of `let`",
|
||||
"static",
|
||||
Applicability::MaybeIncorrect,
|
||||
);
|
||||
} else {
|
||||
err.help("consider using `static` or `const` instead of `let`");
|
||||
}
|
||||
}
|
||||
err.note("for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>");
|
||||
return Err(err);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,7 +2,12 @@ error: expected item, found keyword `let`
|
|||
--> $DIR/suggest-const-for-global-var.rs:1:1
|
||||
|
|
||||
LL | let X: i32 = 12;
|
||||
| ^^^ consider using `const` or `static` instead of `let` for global variables
|
||||
| ^^^
|
||||
| |
|
||||
| `let` cannot be used for global variables
|
||||
| help: consider using `static` or `const` instead of `let`
|
||||
|
|
||||
= note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
|
5
tests/ui/parser/suggest-static-for-global-var-mut.rs
Normal file
5
tests/ui/parser/suggest-static-for-global-var-mut.rs
Normal file
|
@ -0,0 +1,5 @@
|
|||
let mut _data = vec![1,2,3];
|
||||
//~^ ERROR expected item, found keyword `let`
|
||||
|
||||
fn main() {
|
||||
}
|
11
tests/ui/parser/suggest-static-for-global-var-mut.stderr
Normal file
11
tests/ui/parser/suggest-static-for-global-var-mut.stderr
Normal file
|
@ -0,0 +1,11 @@
|
|||
error: expected item, found keyword `let`
|
||||
--> $DIR/suggest-static-for-global-var-mut.rs:1:1
|
||||
|
|
||||
LL | let mut _data = vec![1,2,3];
|
||||
| ^^^ `let` cannot be used for global variables
|
||||
|
|
||||
= help: consider using `static` and a `Mutex` instead of `let mut`
|
||||
= note: for a full list of items that can appear in modules, see <https://doc.rust-lang.org/reference/items.html>
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
Loading…
Add table
Reference in a new issue