bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

errors: span_suggestion takes impl ToString

Browse source 
Change `span_suggestion` (and variants) to take `impl ToString` rather
than `String` for the suggested code, as this simplifies the
requirements on the diagnostic derive.

Signed-off-by: David Wood <david.wood@huawei.com>
This commit is contained in:
David Wood 2022-04-26 06:17:33 +01:00
parent baaa3b6829
commit 73fa217bc1
17 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_parse/src/lexer/mod.rs
View file

@ -612,14 +612,14 @@ impl<'a> StringReader<'a> {
err.span_suggestion_verbose(
prefix_span,
"use `br` for a raw byte string",
"br".to_string(),
"br",
Applicability::MaybeIncorrect,
);
} else if expn_data.is_root() {
err.span_suggestion_verbose(
prefix_span.shrink_to_hi(),
"consider inserting whitespace here",
" ".into(),
" ",
Applicability::MaybeIncorrect,
);
}

6
compiler/rustc_parse/src/parser/expr.rs
View file

@ -1771,7 +1771,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
token.span,
"must have an integer part",
pprust::token_to_string(token).into(),
pprust::token_to_string(token),
Applicability::MachineApplicable,
)
.emit();
@ -2324,7 +2324,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
span,
msg,
sugg.into(),
sugg,
// Has been misleading, at least in the past (closed Issue #48492).
Applicability::MaybeIncorrect,
)
@ -2828,7 +2828,7 @@ impl<'a> Parser<'a> {
e.span_suggestion(
self.prev_token.span.shrink_to_hi(),
"try adding a comma",
",".into(),
",",
Applicability::MachineApplicable,
);
}

10
compiler/rustc_parse/src/parser/item.rs
View file

@ -332,7 +332,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_short(
sp,
&msg,
" struct ".into(),
" struct ",
Applicability::MaybeIncorrect, // speculative
);
Err(err)
@ -532,13 +532,13 @@ impl<'a> Parser<'a> {
.span_suggestion(
span,
"add a trait here",
" Trait ".into(),
" Trait ",
Applicability::HasPlaceholders,
)
.span_suggestion(
span.to(self.token.span),
"for an inherent impl, drop this `for`",
"".into(),
"",
Applicability::MaybeIncorrect,
)
.emit();
@ -1459,7 +1459,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
sp,
"missing comma here",
",".into(),
",",
Applicability::MachineApplicable,
);
}
@ -1498,7 +1498,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
sp,
"try adding a comma",
",".into(),
",",
Applicability::MachineApplicable,
);
err.emit();

4
compiler/rustc_parse/src/parser/mod.rs
View file

@ -802,7 +802,7 @@ impl<'a> Parser<'a> {
.span_suggestion_verbose(
self.prev_token.span.shrink_to_hi().until(self.token.span),
&msg,
" @ ".to_string(),
" @ ",
Applicability::MaybeIncorrect,
)
.emit();
@ -818,7 +818,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
sp,
&format!("missing `{}`", token_str),
token_str.into(),
token_str,
Applicability::MaybeIncorrect,
)
.emit();

2
compiler/rustc_parse/src/parser/pat.rs
View file

@ -606,7 +606,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
mutref_span,
"try switching the order",
"ref mut".into(),
"ref mut",
Applicability::MachineApplicable,
)
.emit();