nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-10-30 14:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary to_string and String::new

Browse Source
This commit is contained in:
Takayuki Maeda 2022-06-13 15:48:40 +09:00
parent c570ab5a0b
commit 77d6176e69
88 changed files with 292 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_ast_lowering/src/expr.rs
View File

@ -1168,7 +1168,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
.span_suggestion(
e.span,
"consider removing the trailing pattern",
String::new(),
"",
rustc_errors::Applicability::MachineApplicable,
)
.emit();

2
compiler/rustc_ast_lowering/src/pat.rs
View File

@ -139,7 +139,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
.span_suggestion_verbose(
sp,
&format!("if you don't need to use the contents of {}, discard the tuple's remaining fields", ident),
"..".to_string(),
"..",
Applicability::MaybeIncorrect,
)
.emit();

16
compiler/rustc_ast_passes/src/ast_validation.rs
View File

@ -488,7 +488,7 @@ impl<'a> AstValidator<'a> {
.span_suggestion(
replace_span,
&format!("provide a definition for the {}", ctx),
sugg.to_string(),
sugg,
Applicability::HasPlaceholders,
)
.emit();
@ -522,7 +522,7 @@ impl<'a> AstValidator<'a> {
.span_suggestion(
span,
&format!("remove the {}", remove_descr),
String::new(),
"",
Applicability::MaybeIncorrect,
)
.span_label(self.current_extern_span(), "`extern` block begins here")
@ -570,7 +570,7 @@ impl<'a> AstValidator<'a> {
.span_suggestion(
body.span,
"remove the invalid body",
";".to_string(),
";",
Applicability::MaybeIncorrect,
)
.help(
@ -599,7 +599,7 @@ impl<'a> AstValidator<'a> {
.span_suggestion_verbose(
span.until(ident.span.shrink_to_lo()),
"remove the qualifiers",
"fn ".to_string(),
"fn ",
Applicability::MaybeIncorrect,
)
.emit();
@ -703,7 +703,7 @@ impl<'a> AstValidator<'a> {
.span_suggestion(
generics.span,
"remove the parameters",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -721,7 +721,7 @@ impl<'a> AstValidator<'a> {
.span_suggestion(
span,
"remove the super traits or lifetime bounds",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -753,7 +753,7 @@ impl<'a> AstValidator<'a> {
.span_suggestion(
total_span,
"remove these associated items",
String::new(),
"",
Applicability::MachineApplicable,
)
.span_label(ident_span, "auto trait cannot have associated items")
@ -993,7 +993,7 @@ fn validate_generic_param_order(
err.span_suggestion(
span,
"reorder the parameters: lifetimes, then consts and types",
ordered_params.clone(),
&ordered_params,
Applicability::MachineApplicable,
);
err.emit();

2
compiler/rustc_ast_passes/src/feature_gate.rs
View File

@ -823,7 +823,7 @@ fn maybe_stage_features(sess: &Session, krate: &ast::Crate) {
err.span_suggestion(
attr.span,
"remove the attribute",
String::new(),
"",
Applicability::MachineApplicable,
);
}

4
compiler/rustc_attr/src/builtin.rs
View File

@ -59,7 +59,7 @@ fn handle_errors(sess: &ParseSess, span: Span, error: AttrError) {
err.span_suggestion(
span,
"consider removing the prefix",
lint_str[1..].to_string(),
&lint_str[1..],
Applicability::MaybeIncorrect,
);
}
@ -942,7 +942,7 @@ pub fn parse_repr_attr(sess: &Session, attr: &Attribute) -> Vec<ReprAttr> {
err.span_suggestion(
item.span(),
"supply an argument here",
"align(...)".to_string(),
"align(...)",
Applicability::HasPlaceholders,
);
err.emit();

12
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View File

@ -225,7 +225,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
.map(|n| format!("`{}`", n))
.unwrap_or_else(|| "the value".to_string())
),
"ref ".to_string(),
"ref ",
Applicability::MachineApplicable,
);
in_pattern = true;
@ -276,7 +276,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
.map(|n| format!("`{}`", n))
.unwrap_or_else(|| "the mutable reference".to_string()),
),
"&mut *".to_string(),
"&mut *",
Applicability::MachineApplicable,
);
}
@ -1519,15 +1519,15 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
Ok(string) => {
if string.starts_with("async ") {
let pos = args_span.lo() + BytePos(6);
(args_span.with_lo(pos).with_hi(pos), "move ".to_string())
(args_span.with_lo(pos).with_hi(pos), "move ")
} else if string.starts_with("async|") {
let pos = args_span.lo() + BytePos(5);
(args_span.with_lo(pos).with_hi(pos), " move".to_string())
(args_span.with_lo(pos).with_hi(pos), " move")
} else {
(args_span.shrink_to_lo(), "move ".to_string())
(args_span.shrink_to_lo(), "move ")
}
}
Err(_) => (args_span, "move |<args>| <body>".to_string()),
Err(_) => (args_span, "move |<args>| <body>"),
};
let kind = match use_span.generator_kind() {
Some(generator_kind) => match generator_kind {

2
compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs
View File

@ -212,7 +212,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
"consider adding semicolon after the expression so its \
temporaries are dropped sooner, before the local variables \
declared by the block are dropped",
";".to_string(),
";",
Applicability::MaybeIncorrect,
);
}

6
compiler/rustc_borrowck/src/diagnostics/mod.rs
View File

@ -1023,7 +1023,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
avoid moving into the `for` loop",
ty,
),
"&".to_string(),
"&",
Applicability::MaybeIncorrect,
);
}
@ -1049,7 +1049,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
.map(|n| format!("`{}`", n))
.unwrap_or_else(|| "the mutable reference".to_string()),
),
"&mut *".to_string(),
"&mut *",
Applicability::MachineApplicable,
);
}
@ -1067,7 +1067,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
err.span_suggestion_verbose(
fn_call_span.shrink_to_lo(),
"consider calling `.as_ref()` to borrow the type's contents",
"as_ref().".to_string(),
"as_ref().",
Applicability::MachineApplicable,
);
}

2
compiler/rustc_borrowck/src/diagnostics/move_errors.rs
View File

@ -417,7 +417,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_hi(),
&format!("consider borrowing the `{}`'s content", diag_name.unwrap()),
".as_ref()".to_string(),
".as_ref()",
Applicability::MaybeIncorrect,
);
} else if let Some(use_spans) = use_spans {

6
compiler/rustc_borrowck/src/diagnostics/mutability_errors.rs
View File

@ -295,7 +295,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
source_info.span.with_hi(source_info.span.lo() + BytePos(5)),
"try removing `&mut` here",
String::new(),
"",
Applicability::MachineApplicable,
);
} else {
@ -316,7 +316,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
decl.source_info.span.shrink_to_lo(),
"consider making the binding mutable",
"mut ".to_string(),
"mut ",
Applicability::MachineApplicable,
);
}
@ -402,7 +402,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
err.span_suggestion(
span,
"try removing `&mut` here",
String::new(),
"",
Applicability::MaybeIncorrect,
);
}

2
compiler/rustc_borrowck/src/diagnostics/region_errors.rs
View File

@ -860,7 +860,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_hi(),
"consider relaxing the implicit `'static` requirement",
" + '_".to_string(),
" + '_",
Applicability::MaybeIncorrect,
);
suggested = true;

2
compiler/rustc_borrowck/src/lib.rs
View File

@ -426,7 +426,7 @@ fn do_mir_borrowck<'a, 'tcx>(
.span_suggestion_short(
mut_span,
"remove this `mut`",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();

4
compiler/rustc_builtin_macros/src/assert.rs
View File

@ -132,7 +132,7 @@ fn parse_assert<'a>(cx: &mut ExtCtxt<'a>, sp: Span, stream: TokenStream) -> PRes
err.span_suggestion(
parser.token.span,
"try removing semicolon",
String::new(),
"",
Applicability::MaybeIncorrect,
);
err.emit();
@ -153,7 +153,7 @@ fn parse_assert<'a>(cx: &mut ExtCtxt<'a>, sp: Span, stream: TokenStream) -> PRes
err.span_suggestion_short(
comma_span,
"try adding a comma",
", ".to_string(),
", ",
Applicability::MaybeIncorrect,
);
err.emit();

2
compiler/rustc_builtin_macros/src/derive.rs
View File

@ -142,7 +142,7 @@ fn report_path_args(sess: &Session, meta: &ast::MetaItem) {
let report_error = |title, action| {
let span = meta.span.with_lo(meta.path.span.hi());
sess.struct_span_err(span, title)
.span_suggestion(span, action, String::new(), Applicability::MachineApplicable)
.span_suggestion(span, action, "", Applicability::MachineApplicable)
.emit();
};
match meta.kind {

2
compiler/rustc_builtin_macros/src/test.rs
View File

@ -118,7 +118,7 @@ pub fn expand_test_or_bench(
};
err.span_label(attr_sp, "the `#[test]` macro causes a a function to be run on a test and has no effect on non-functions")
.span_label(item.span, format!("expected a non-associated function, found {} {}", item.kind.article(), item.kind.descr()))
.span_suggestion(attr_sp, "replace with conditional compilation to make the item only exist when tests are being run", String::from("#[cfg(test)]"), Applicability::MaybeIncorrect)
.span_suggestion(attr_sp, "replace with conditional compilation to make the item only exist when tests are being run", "#[cfg(test)]", Applicability::MaybeIncorrect)
.emit();
return vec![Annotatable::Item(item)];

2
compiler/rustc_const_eval/src/transform/check_consts/check.rs
View File

@ -1035,7 +1035,7 @@ fn emit_unstable_in_stable_error(ccx: &ConstCx<'_, '_>, span: Span, gate: Symbol
.span_suggestion(
attr_span,
"if it is not part of the public API, make this function unstably const",
concat!(r#"#[rustc_const_unstable(feature = "...", issue = "...")]"#, '\n').to_owned(),
concat!(r#"#[rustc_const_unstable(feature = "...", issue = "...")]"#, '\n'),
Applicability::HasPlaceholders,
)
.span_suggestion(

2
compiler/rustc_expand/src/base.rs
View File

@ -1194,7 +1194,7 @@ pub fn expr_to_spanned_string<'a>(
err.span_suggestion(
expr.span.shrink_to_lo(),
"consider removing the leading `b`",
String::new(),
"",
Applicability::MaybeIncorrect,
);
Some((err, true))

2
compiler/rustc_expand/src/expand.rs
View File

@ -945,7 +945,7 @@ pub fn ensure_complete_parse<'a>(
err.span_suggestion(
semi_span,
"you might be missing a semicolon here",
";".to_owned(),
";",
Applicability::MaybeIncorrect,
);
}

4
compiler/rustc_expand/src/mbe/macro_rules.rs
View File

@ -102,7 +102,7 @@ fn emit_frag_parse_err(
e.span_suggestion_verbose(
site_span.shrink_to_hi(),
"add `;` to interpret the expansion as a statement",
";".to_string(),
";",
Applicability::MaybeIncorrect,
);
}
@ -357,7 +357,7 @@ fn expand_macro<'cx>(
err.span_suggestion_short(
comma_span,
"missing comma here",
", ".to_string(),
", ",
Applicability::MachineApplicable,
);
}

4
compiler/rustc_expand/src/mbe/metavar_expr.rs
View File

@ -52,7 +52,7 @@ impl MetaVarExpr {
err.span_suggestion(
ident.span,
"supported expressions are count, ignore, index and length",
String::new(),
"",
Applicability::MachineApplicable,
);
return Err(err);
@ -142,7 +142,7 @@ fn parse_ident<'sess>(
err.span_suggestion(
token.span,
&format!("try removing `{}`", &token_str),
String::new(),
"",
Applicability::MaybeIncorrect,
);
return Err(err);

12
compiler/rustc_infer/src/infer/error_reporting/mod.rs
View File

@ -670,7 +670,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
err.span_suggestion(
source_map.end_point(cause.span),
"try removing this `?`",
"".to_string(),
"",
Applicability::MachineApplicable,
);
}
@ -726,14 +726,14 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
err.span_suggestion_short(
sp,
"consider removing this semicolon and boxing the expressions",
String::new(),
"",
Applicability::MachineApplicable,
);
} else {
err.span_suggestion_short(
sp,
"consider removing this semicolon",
String::new(),
"",
Applicability::MachineApplicable,
);
}
@ -776,7 +776,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
err.span_suggestion_short(
sp,
"consider removing this semicolon",
String::new(),
"",
Applicability::MachineApplicable,
);
}
@ -1935,7 +1935,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
diag.span_suggestion_verbose(
exp_span.shrink_to_hi(),
"consider `await`ing on the `Future`",
".await".to_string(),
".await",
Applicability::MaybeIncorrect,
);
}
@ -1945,7 +1945,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
diag.span_suggestion_verbose(
span.shrink_to_hi(),
"consider `await`ing on the `Future`",
".await".to_string(),
".await",
Applicability::MaybeIncorrect,
);
}

2
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/mismatched_static_lifetime.rs
View File

@ -85,7 +85,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_hi(),
"consider relaxing the implicit `'static` requirement",
" + '_".to_string(),
" + '_",
Applicability::MaybeIncorrect,
);
}

2
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/named_anon_conflict.rs
View File

@ -107,7 +107,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
diag.span_suggestion(
new_ty_span,
&format!("add explicit lifetime `{}` to {}", named, span_label_var),
new_ty.to_string(),
new_ty,
Applicability::Unspecified,
);

10
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs
View File

@ -328,7 +328,7 @@ pub fn suggest_new_region_bound(
err.span_suggestion_verbose(
span,
&format!("{} `impl Trait`'s {}", consider, explicit_static),
lifetime_name.clone(),
&lifetime_name,
Applicability::MaybeIncorrect,
);
}
@ -363,7 +363,7 @@ pub fn suggest_new_region_bound(
captures = captures,
explicit = explicit,
),
plus_lt.clone(),
&plus_lt,
Applicability::MaybeIncorrect,
);
}
@ -378,7 +378,7 @@ pub fn suggest_new_region_bound(
captures = captures,
explicit = explicit,
),
plus_lt.clone(),
&plus_lt,
Applicability::MaybeIncorrect,
);
}
@ -391,7 +391,7 @@ pub fn suggest_new_region_bound(
err.span_suggestion_verbose(
lt.span,
&format!("{} trait object's {}", consider, explicit_static),
lifetime_name.clone(),
&lifetime_name,
Applicability::MaybeIncorrect,
);
}
@ -535,7 +535,7 @@ impl<'a, 'tcx> NiceRegionError<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_hi(),
"consider relaxing the implicit `'static` requirement",
" + '_".to_string(),
" + '_",
Applicability::MaybeIncorrect,
);
suggested = true;

2
compiler/rustc_interface/src/passes.rs
View File

@ -449,7 +449,7 @@ pub fn configure_and_expand(
.span_suggestion(
first_span,
"try using their name instead",
"ferris".to_string(),
"ferris",
Applicability::MaybeIncorrect,
)
.emit();

2
compiler/rustc_lint/src/array_into_iter.rs
View File

@ -136,7 +136,7 @@ impl<'tcx> LateLintPass<'tcx> for ArrayIntoIter {
diag.span_suggestion(
receiver_arg.span.shrink_to_hi().to(expr.span.shrink_to_hi()),
"or remove `.into_iter()` to iterate by value",
String::new(),
"",
Applicability::MaybeIncorrect,
);
} else if receiver_ty.is_array() {

12
compiler/rustc_lint/src/builtin.rs
View File

@ -993,7 +993,7 @@ fn lint_deprecated_attr(
.span_suggestion_short(
attr.span,
suggestion.unwrap_or("remove this attribute"),
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -1182,7 +1182,7 @@ impl<'tcx> LateLintPass<'tcx> for InvalidNoMangleItems {
.span_suggestion_short(
no_mangle_attr.span,
"remove this attribute",
String::new(),
"",
// Use of `#[no_mangle]` suggests FFI intent; correct
// fix may be to monomorphize source by hand
Applicability::MaybeIncorrect,
@ -1221,7 +1221,7 @@ impl<'tcx> LateLintPass<'tcx> for InvalidNoMangleItems {
err.span_suggestion(
const_span,
"try a static value",
"pub static".to_owned(),
"pub static",
Applicability::MachineApplicable,
);
err.emit();
@ -1405,7 +1405,7 @@ impl UnreachablePub {
err.span_suggestion(
vis_span,
"consider restricting its visibility",
"pub(crate)".to_owned(),
"pub(crate)",
applicability,
);
if exportable {
@ -1566,7 +1566,7 @@ impl<'tcx> LateLintPass<'tcx> for TypeAliasBounds {
err.span_suggestion(
type_alias_generics.where_clause_span,
"the clause will not be checked when the type alias is used, and should be removed",
String::new(),
"",
Applicability::MachineApplicable,
);
if !suggested_changing_assoc_types {
@ -1830,7 +1830,7 @@ impl EarlyLintPass for EllipsisInclusiveRangePatterns {
});
}
} else {
let replace = "..=".to_owned();
let replace = "..=";
if join.edition() >= Edition::Edition2021 {
let mut err =
rustc_errors::struct_span_err!(cx.sess(), pat.span, E0783, "{}", msg,);

8
compiler/rustc_lint/src/context.rs
View File

@ -718,7 +718,7 @@ pub trait LintContext: Sized {
the macro must produce the documentation as part of its expansion");
}
BuiltinLintDiagnostics::PatternsInFnsWithoutBody(span, ident) => {
db.span_suggestion(span, "remove `mut` from the parameter", ident.to_string(), Applicability::MachineApplicable);
db.span_suggestion(span, "remove `mut` from the parameter", ident, Applicability::MachineApplicable);
}
BuiltinLintDiagnostics::MissingAbi(span, default_abi) => {
db.span_label(span, "ABI should be specified here");
@ -778,7 +778,7 @@ pub trait LintContext: Sized {
// Suggest the most probable if we found one
if let Some(best_match) = find_best_match_for_name(&possibilities, name, None) {
db.span_suggestion(name_span, "did you mean", format!("{best_match}"), Applicability::MaybeIncorrect);
db.span_suggestion(name_span, "did you mean", best_match, Applicability::MaybeIncorrect);
}
},
BuiltinLintDiagnostics::UnexpectedCfg((name, name_span), Some((value, value_span))) => {
@ -805,7 +805,7 @@ pub trait LintContext: Sized {
} else {
db.note(&format!("no expected value for `{name}`"));
if name != sym::feature {
db.span_suggestion(name_span.shrink_to_hi().to(value_span), "remove the value", String::new(), Applicability::MaybeIncorrect);
db.span_suggestion(name_span.shrink_to_hi().to(value_span), "remove the value", "", Applicability::MaybeIncorrect);
}
}
},
@ -852,7 +852,7 @@ pub trait LintContext: Sized {
db.span_suggestion(
deletion_span,
"elide the unused lifetime",
String::new(),
"",
Applicability::MachineApplicable,
);
},

8
compiler/rustc_lint/src/internal.rs
View File

@ -141,7 +141,7 @@ impl<'tcx> LateLintPass<'tcx> for TyTyKind {
.span_suggestion(
span,
"try using `ty::<kind>` directly",
"ty".to_string(),
"ty",
Applicability::MaybeIncorrect, // ty maybe needs an import
)
.emit();
@ -170,7 +170,7 @@ impl<'tcx> LateLintPass<'tcx> for TyTyKind {
.span_suggestion(
path.span,
"try using `ty::<kind>` directly",
"ty".to_string(),
"ty",
Applicability::MaybeIncorrect, // ty maybe needs an import
)
.emit();
@ -188,7 +188,7 @@ impl<'tcx> LateLintPass<'tcx> for TyTyKind {
.span_suggestion(
path.span,
"try using `ty::<kind>` directly",
"ty".to_string(),
"ty",
Applicability::MaybeIncorrect, // ty maybe needs an import
)
.emit();
@ -208,7 +208,7 @@ impl<'tcx> LateLintPass<'tcx> for TyTyKind {
.span_suggestion(
path.span,
"try using `ty::<kind>` directly",
"ty".to_string(),
"ty",
Applicability::MaybeIncorrect, // ty maybe needs an import
)
.emit();

6
compiler/rustc_lint/src/levels.rs
View File

@ -443,7 +443,7 @@ impl<'s> LintLevelsBuilder<'s> {
.span_suggestion(
sp,
"change it to",
new_lint_name.to_string(),
new_lint_name,
Applicability::MachineApplicable,
)
.emit();
@ -516,7 +516,7 @@ impl<'s> LintLevelsBuilder<'s> {
err.span_suggestion(
sp,
"use the new name",
new_name.to_string(),
new_name,
Applicability::MachineApplicable,
);
}
@ -543,7 +543,7 @@ impl<'s> LintLevelsBuilder<'s> {
db.span_suggestion(
sp,
"did you mean",
suggestion.to_string(),
suggestion,
Applicability::MachineApplicable,
);
}

4
compiler/rustc_lint/src/redundant_semicolon.rs
View File

@ -54,9 +54,7 @@ fn maybe_lint_redundant_semis(cx: &EarlyContext<'_>, seq: &mut Option<(Span, boo
} else {
("unnecessary trailing semicolon", "remove this semicolon")
};
lint.build(msg)
.span_suggestion(span, rem, String::new(), Applicability::MaybeIncorrect)
.emit();
lint.build(msg).span_suggestion(span, rem, "", Applicability::MaybeIncorrect).emit();
});
}
}

2
compiler/rustc_lint/src/unused.rs
View File

@ -160,7 +160,7 @@ impl<'tcx> LateLintPass<'tcx> for UnusedResults {
lint.span_suggestion_verbose(
expr.span.shrink_to_lo(),
"use `let _ = ...` to ignore the resulting value",
"let _ = ".to_string(),
"let _ = ",
Applicability::MachineApplicable,
);
lint.emit();

2
compiler/rustc_middle/src/middle/stability.rs
View File

@ -153,7 +153,7 @@ pub fn deprecation_suggestion(
diag.span_suggestion(
span,
&format!("replace the use of the deprecated {}", kind),
suggestion.to_string(),
suggestion,
Applicability::MachineApplicable,
);
}

4
compiler/rustc_middle/src/traits/mod.rs
View File

@ -933,7 +933,7 @@ impl ObjectSafetyViolation {
trait objects",
name
),
sugg.to_string(),
sugg,
Applicability::MaybeIncorrect,
);
}
@ -957,7 +957,7 @@ impl ObjectSafetyViolation {
"consider changing method `{}`'s `self` parameter to be `&self`",
name
),
"&Self".to_string(),
"&Self",
Applicability::MachineApplicable,
);
}

8
compiler/rustc_parse/src/lexer/unescape_error_reporting.rs
View File

@ -105,7 +105,7 @@ pub(crate) fn emit_unescape_error(
handler.span_suggestion(
span,
"consider removing the non-printing characters",
ch.to_string(),
ch,
Applicability::MaybeIncorrect,
);
}
@ -141,7 +141,7 @@ pub(crate) fn emit_unescape_error(
.span_suggestion(
char_span,
"escape the character",
c.escape_default().to_string(),
c.escape_default(),
Applicability::MachineApplicable,
)
.emit();
@ -157,7 +157,7 @@ pub(crate) fn emit_unescape_error(
.span_suggestion(
span,
"escape the character",
"\\r".to_string(),
"\\r",
Applicability::MachineApplicable,
)
.emit();
@ -299,7 +299,7 @@ pub(crate) fn emit_unescape_error(
.span_suggestion_verbose(
span.shrink_to_hi(),
"terminate the unicode escape",
"}".to_string(),
"}",
Applicability::MaybeIncorrect,
)
.emit();

2
compiler/rustc_parse/src/lexer/unicode_chars.rs
View File

@ -369,7 +369,7 @@ pub(super) fn check_for_substitution<'a>(
"Unicode character '{}' ({}) looks like '{}' ({}), but it is not",
ch, u_name, ascii_char, ascii_name
);
err.span_suggestion(span, &msg, ascii_char.to_string(), Applicability::MaybeIncorrect);
err.span_suggestion(span, &msg, ascii_char, Applicability::MaybeIncorrect);
}
token.clone()
}

2
compiler/rustc_parse/src/lib.rs
View File

@ -282,7 +282,7 @@ fn error_malformed_cfg_attr_missing(span: Span, parse_sess: &ParseSess) {
.span_suggestion(
span,
"missing condition and attribute",
CFG_ATTR_GRAMMAR_HELP.to_string(),
CFG_ATTR_GRAMMAR_HELP,
Applicability::HasPlaceholders,
)
.note(CFG_ATTR_NOTE_REF)

7
compiler/rustc_parse/src/parser/attr.rs
View File

@ -78,7 +78,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
replacement_span,
"you might have meant to write a regular comment",
String::new(),
"",
rustc_errors::Applicability::MachineApplicable,
);
}
@ -200,12 +200,11 @@ impl<'a> Parser<'a> {
item.kind.descr(),
attr_name
),
(match attr_type {
match attr_type {
OuterAttributeType::Attribute => "",
OuterAttributeType::DocBlockComment => "*",
OuterAttributeType::DocComment => "/",
})
.to_string(),
},
rustc_errors::Applicability::MachineApplicable,
);
return None;

38
compiler/rustc_parse/src/parser/diagnostics.rs
View File

@ -431,7 +431,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
ident.span.shrink_to_lo(),
&format!("escape `{}` to use it as an identifier", ident.name),
"r#".to_owned(),
"r#",
Applicability::MaybeIncorrect,
);
}
@ -445,7 +445,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
self.token.span,
"remove this comma",
String::new(),
"",
Applicability::MachineApplicable,
);
}
@ -518,7 +518,7 @@ impl<'a> Parser<'a> {
self.bump();
let sp = self.prev_token.span;
self.struct_span_err(sp, &msg)
.span_suggestion_short(sp, "change this to `;`", ";".to_string(), appl)
.span_suggestion_short(sp, "change this to `;`", ";", appl)
.emit();
return Ok(true);
} else if self.look_ahead(0, |t| {
@ -537,7 +537,7 @@ impl<'a> Parser<'a> {
let sp = self.prev_token.span.shrink_to_hi();
self.struct_span_err(sp, &msg)
.span_label(self.token.span, "unexpected token")
.span_suggestion_short(sp, "add `;` here", ";".to_string(), appl)
.span_suggestion_short(sp, "add `;` here", ";", appl)
.emit();
return Ok(true);
}
@ -664,7 +664,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
span,
&format!("remove the extra `#`{}", pluralize!(count)),
String::new(),
"",
Applicability::MachineApplicable,
);
err.span_label(
@ -761,7 +761,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
sp,
"maybe write a path separator here",
"::".to_string(),
"::",
if allow_unstable {
Applicability::MaybeIncorrect
} else {
@ -773,7 +773,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
sp,
"try using a semicolon",
";".to_string(),
";",
Applicability::MaybeIncorrect,
);
} else if allow_unstable {
@ -917,7 +917,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
span,
&format!("remove extra angle bracket{}", pluralize!(total_num_of_gt)),
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -999,7 +999,7 @@ impl<'a> Parser<'a> {
e.span_suggestion_verbose(
binop.span.shrink_to_lo(),
TURBOFISH_SUGGESTION_STR,
"::".to_string(),
"::",
Applicability::MaybeIncorrect,
)
.emit();
@ -1158,7 +1158,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
op.span.shrink_to_lo(),
TURBOFISH_SUGGESTION_STR,
"::".to_string(),
"::",
Applicability::MaybeIncorrect,
);
};
@ -1701,7 +1701,7 @@ impl<'a> Parser<'a> {
Applicability::MachineApplicable,
);
}
err.span_suggestion(lo.shrink_to_lo(), &format!("{prefix}you can still access the deprecated `try!()` macro using the \"raw identifier\" syntax"), "r#".to_string(), Applicability::MachineApplicable);
err.span_suggestion(lo.shrink_to_lo(), &format!("{prefix}you can still access the deprecated `try!()` macro using the \"raw identifier\" syntax"), "r#", Applicability::MachineApplicable);
err.emit();
Ok(self.mk_expr_err(lo.to(hi)))
} else {
@ -1997,7 +1997,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
span,
"declare the type after the parameter binding",
String::from("<identifier>: <type>"),
"<identifier>: <type>",
Applicability::HasPlaceholders,
);
return Some(ident);
@ -2102,7 +2102,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
pat.span,
"give this argument a name or use an underscore to ignore it",
"_".to_owned(),
"_",
Applicability::MachineApplicable,
)
.emit();
@ -2336,7 +2336,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
start.until(self.token.span),
"the `const` keyword is only needed in the definition of the type",
String::new(),
"",
Applicability::MaybeIncorrect,
);
err.emit();
@ -2394,7 +2394,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
snapshot.token.span,
"if you meant to use an associated type binding, replace `==` with `=`",
"=".to_string(),
"=",
Applicability::MaybeIncorrect,
);
let value = self.mk_expr_err(start.to(expr.span));
@ -2408,7 +2408,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
snapshot.token.span,
"write a path separator here",
"::".to_string(),
"::",
Applicability::MaybeIncorrect,
);
err.emit();
@ -2461,7 +2461,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
move_async_span,
"try switching the order",
"async move".to_owned(),
"async move",
Applicability::MaybeIncorrect,
);
err
@ -2566,7 +2566,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
span,
"maybe write a path separator here",
"::".to_string(),
"::",
Applicability::MaybeIncorrect,
);
} else {
@ -2669,7 +2669,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
between_span,
"use single colon",
": ".to_owned(),
": ",
Applicability::MachineApplicable,
);
return Err(err);

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

@ -230,7 +230,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
sp,
&format!("`{s}=` is not a valid comparison operator, use `{s}`", s = sugg),
sugg.to_string(),
sugg,
Applicability::MachineApplicable,
)
.emit();
@ -247,7 +247,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
sp,
"`<>` is not a valid comparison operator, use `!=`",
"!=".to_string(),
"!=",
Applicability::MachineApplicable,
)
.emit();
@ -459,7 +459,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
self.token.span,
&format!("use `{good}` to perform logical {english}"),
good.to_string(),
good,
Applicability::MachineApplicable,
)
.note("unlike in e.g., python and PHP, `&&` and `||` are used for logical operators")
@ -584,7 +584,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
lo,
"try removing the `+`",
"".to_string(),
"",
Applicability::MachineApplicable,
);
}
@ -634,7 +634,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
lo,
"use `!` to perform bitwise not",
"!".to_owned(),
"!",
Applicability::MachineApplicable,
)
.emit();
@ -673,7 +673,7 @@ impl<'a> Parser<'a> {
// trailing whitespace after the `!` in our suggestion
self.sess.source_map().span_until_non_whitespace(lo.to(not_token.span)),
"use `!` to perform logical negation",
"!".to_owned(),
"!",
Applicability::MachineApplicable,
)
.emit();
@ -744,7 +744,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
label.ident.span,
"use the correct loop label format",
label.ident.to_string(),
label.ident,
Applicability::MachineApplicable,
)
.emit();
@ -885,7 +885,7 @@ impl<'a> Parser<'a> {
"{}remove the type ascription",
if is_nightly { "alternatively, " } else { "" }
),
String::new(),
"",
if is_nightly {
Applicability::MaybeIncorrect
} else {
@ -929,7 +929,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
lt_span,
"remove the lifetime annotation",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -1626,7 +1626,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
lo.shrink_to_hi(),
"add `:` after the label",
": ".to_string(),
": ",
Applicability::MachineApplicable,
)
.note("labels are used before loops and blocks, allowing e.g., `break 'label` to them")
@ -1645,7 +1645,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
span_dc,
"replace with the new syntax",
"try".to_string(),
"try",
Applicability::MachineApplicable,
)
.note("following RFC #2388, the new non-placeholder syntax is `try`")
@ -2088,7 +2088,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
span_for,
"remove the parameters",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -2352,7 +2352,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
cond.span.shrink_to_lo(),
"add an `if` if this is the condition of a chained `else if` statement",
"if ".to_string(),
"if ",
Applicability::MaybeIncorrect,
)
.emit();
@ -2388,12 +2388,7 @@ impl<'a> Parser<'a> {
self.struct_span_err(last, "outer attributes are not allowed on `if` and `else` branches")
.span_label(branch_span, "the attributes are attached to this branch")
.span_label(ctx_span, format!("the branch belongs to this `{ctx}`"))
.span_suggestion(
span,
"remove the attributes",
String::new(),
Applicability::MachineApplicable,
)
.span_suggestion(span, "remove the attributes", "", Applicability::MachineApplicable)
.emit();
}
@ -2502,7 +2497,7 @@ impl<'a> Parser<'a> {
e.span_suggestion_short(
match_span,
"try removing this `match`",
String::new(),
"",
Applicability::MaybeIncorrect, // speculative
);
}
@ -2578,7 +2573,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
semi_sp,
"use a comma to end a `match` arm expression",
",".to_string(),
",",
Applicability::MachineApplicable,
);
}
@ -2679,7 +2674,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
this.token.span,
"try using a fat arrow here",
"=>".to_string(),
"=>",
Applicability::MaybeIncorrect,
);
err.emit();
@ -2739,7 +2734,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_short(
arm_start_span.shrink_to_hi(),
"missing a comma here to end this `match` arm",
",".to_owned(),
",",
Applicability::MachineApplicable,
);
return Err(err);
@ -2768,7 +2763,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
hi.shrink_to_hi(),
"missing a comma here to end this `match` arm",
",".to_owned(),
",",
Applicability::MachineApplicable,
)
.emit();
@ -3049,7 +3044,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
self.token.span,
"remove this comma",
String::new(),
"",
Applicability::MachineApplicable,
)
.note("the base struct must always be the last field")
@ -3103,7 +3098,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
field_name.span.shrink_to_hi().to(self.token.span),
"replace equals symbol with a colon",
":".to_string(),
":",
Applicability::MachineApplicable,
)
.emit();
@ -3114,13 +3109,13 @@ impl<'a> Parser<'a> {
.span_suggestion(
span,
"use `..` for an exclusive range",
"..".to_owned(),
"..",
Applicability::MaybeIncorrect,
)
.span_suggestion(
span,
"or `..=` for an inclusive range",
"..=".to_owned(),
"..=",
Applicability::MaybeIncorrect,
)
.emit();
@ -3132,7 +3127,7 @@ impl<'a> Parser<'a> {
span,
"if you meant to write a comparison against a negative value, add a \
space in between `<` and `-`",
"< -".to_string(),
"< -",
Applicability::MaybeIncorrect,
)
.emit();

2
compiler/rustc_parse/src/parser/generics.rs
View File

@ -271,7 +271,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
prev_token.shrink_to_hi().to(self.prev_token.span),
"consider joining the two `where` clauses into one",
",".to_owned(),
",",
Applicability::MaybeIncorrect,
);
err.emit();

41
compiler/rustc_parse/src/parser/item.rs
View File

@ -298,7 +298,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
span,
"items are imported using the `use` keyword",
"use".to_owned(),
"use",
Applicability::MachineApplicable,
)
.emit();
@ -458,7 +458,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
path.span,
"perhaps you meant to define a macro",
"macro_rules".to_string(),
"macro_rules",
Applicability::MachineApplicable,
);
}
@ -486,7 +486,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
self.token.span,
"consider removing this semicolon",
String::new(),
"",
Applicability::MaybeIncorrect,
);
}
@ -606,7 +606,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
missing_for_span,
"add `for` here",
" for ".to_string(),
" for ",
Applicability::MachineApplicable,
)
.emit();
@ -1082,7 +1082,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
span.with_hi(ident.span.lo()),
"try using a static value",
"static ".to_string(),
"static ",
Applicability::MachineApplicable,
)
.note("for more information, visit https://doc.rust-lang.org/std/keyword.extern.html")
@ -1121,7 +1121,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
const_span,
"you might want to declare a static instead",
"static".to_owned(),
"static",
Applicability::MaybeIncorrect,
)
.emit();
@ -1555,7 +1555,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_short(
self.prev_token.span,
"field names and their types are separated with `:`",
":".to_string(),
":",
Applicability::MachineApplicable,
);
err.emit();
@ -1582,7 +1582,7 @@ impl<'a> Parser<'a> {
.span_suggestion_verbose(
self.token.span,
"write a path separator here",
"::".to_string(),
"::",
Applicability::MaybeIncorrect,
)
.emit();
@ -1595,7 +1595,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
sp,
"remove this unsupported default value",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -1691,7 +1691,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
macro_rules_span,
"add a `!`",
"macro_rules!".to_owned(),
"macro_rules!",
Applicability::MachineApplicable,
)
.emit();
@ -1720,12 +1720,7 @@ impl<'a> Parser<'a> {
// Handle macro_rules! foo!
let span = self.prev_token.span;
self.struct_span_err(span, "macro names aren't followed by a `!`")
.span_suggestion(
span,
"remove the `!`",
"".to_owned(),
Applicability::MachineApplicable,
)
.span_suggestion(span, "remove the `!`", "", Applicability::MachineApplicable)
.emit();
}
@ -1751,7 +1746,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
vis.span,
"try exporting the macro",
"#[macro_export]".to_owned(),
"#[macro_export]",
Applicability::MaybeIncorrect, // speculative
)
.emit();
@ -1760,7 +1755,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
vis.span,
"remove the visibility",
String::new(),
"",
Applicability::MachineApplicable,
)
.help(&format!("try adjusting the macro to put `{vstr}` inside the invocation"))
@ -1794,14 +1789,14 @@ impl<'a> Parser<'a> {
err.span_suggestion(
span,
"change the delimiters to curly braces",
" { /* items */ }".to_string(),
" { /* items */ }",
Applicability::HasPlaceholders,
);
}
err.span_suggestion(
span.shrink_to_hi(),
"add a semicolon",
';'.to_string(),
';',
Applicability::MaybeIncorrect,
);
err.emit();
@ -1826,7 +1821,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
item.unwrap().span,
&format!("consider creating a new `{kw_str}` definition instead of nesting"),
String::new(),
"",
Applicability::MaybeIncorrect,
)
.emit();
@ -2086,7 +2081,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
self.token.uninterpolated_span(),
&format!("`{original_kw}` already used earlier, remove this one"),
"".to_string(),
"",
Applicability::MachineApplicable,
)
.span_note(original_sp, &format!("`{original_kw}` first seen here"));
@ -2134,7 +2129,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
current_vis.span,
"there is already a visibility modifier, remove one",
"".to_string(),
"",
Applicability::MachineApplicable,
)
.span_note(orig_vis.span, "explicit visibility first seen here");

2
compiler/rustc_parse/src/parser/mod.rs
View File

@ -1350,7 +1350,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
lit.span,
"specify the ABI with a string literal",
"\"C\"".to_string(),
"\"C\"",
Applicability::MaybeIncorrect,
)
.emit();

42
compiler/rustc_parse/src/parser/pat.rs
View File

@ -218,12 +218,7 @@ impl<'a> Parser<'a> {
if let token::OrOr = self.token.kind {
let span = self.token.span;
let mut err = self.struct_span_err(span, "unexpected `||` before function parameter");
err.span_suggestion(
span,
"remove the `||`",
String::new(),
Applicability::MachineApplicable,
);
err.span_suggestion(span, "remove the `||`", "", Applicability::MachineApplicable);
err.note("alternatives in or-patterns are separated with `|`, not `||`");
err.emit();
self.bump();
@ -287,7 +282,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
self.token.span,
"use a single `|` to separate multiple alternative patterns",
"|".to_owned(),
"|",
Applicability::MachineApplicable,
);
if let Some(lo) = lo {
@ -303,7 +298,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
span,
&format!("remove the `{}`", pprust::token_to_string(&self.token)),
String::new(),
"",
Applicability::MachineApplicable,
);
if let Some(lo) = lo {
@ -433,7 +428,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
lo,
"for a rest pattern, use `..` instead of `...`",
"..".to_owned(),
"..",
Applicability::MachineApplicable,
)
.emit();
@ -537,12 +532,7 @@ impl<'a> Parser<'a> {
let span = self.prev_token.span;
self.struct_span_err(span, &format!("unexpected lifetime `{}` in pattern", name))
.span_suggestion(
span,
"remove the lifetime",
String::new(),
Applicability::MachineApplicable,
)
.span_suggestion(span, "remove the lifetime", "", Applicability::MachineApplicable)
.emit();
}
}
@ -665,7 +655,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
span,
"remove the additional `mut`s",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -759,24 +749,14 @@ impl<'a> Parser<'a> {
fn error_inclusive_range_with_extra_equals(&self, span: Span) {
self.struct_span_err(span, "unexpected `=` after inclusive range")
.span_suggestion_short(
span,
"use `..=` instead",
"..=".to_string(),
Applicability::MaybeIncorrect,
)
.span_suggestion_short(span, "use `..=` instead", "..=", Applicability::MaybeIncorrect)
.note("inclusive ranges end with a single equals sign (`..=`)")
.emit();
}
fn error_inclusive_range_with_no_end(&self, span: Span) {
struct_span_err!(self.sess.span_diagnostic, span, E0586, "inclusive range with no end")
.span_suggestion_short(
span,
"use `..` instead",
"..".to_string(),
Applicability::MachineApplicable,
)
.span_suggestion_short(span, "use `..` instead", "..", Applicability::MachineApplicable)
.note("inclusive ranges must be bounded at the end (`..=b` or `a..=b`)")
.emit();
}
@ -794,7 +774,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
re.span,
"use `..=` instead",
"..=".to_string(),
"..=",
Applicability::MachineApplicable,
)
.emit();
@ -1035,7 +1015,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_short(
sp,
"remove this comma",
String::new(),
"",
Applicability::MachineApplicable,
);
}
@ -1107,7 +1087,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
self.token.span,
"to omit remaining fields, use one fewer `.`",
"..".to_owned(),
"..",
Applicability::MachineApplicable,
)
.emit();

12
compiler/rustc_parse/src/parser/path.rs
View File

@ -112,7 +112,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
self.prev_token.span,
"use double colon",
"::".to_string(),
"::",
Applicability::MachineApplicable,
)
.emit();
@ -283,7 +283,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
arg.span().shrink_to_hi(),
"you might have meant to end the type parameters here",
">".to_string(),
">",
Applicability::MaybeIncorrect,
);
}
@ -455,7 +455,7 @@ impl<'a> Parser<'a> {
"remove extra angle bracket{}",
pluralize!(snapshot.unmatched_angle_bracket_count)
),
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -489,7 +489,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_verbose(
self.prev_token.span.until(self.token.span),
"use a comma to separate type parameters",
", ".to_string(),
", ",
Applicability::MachineApplicable,
);
err.emit();
@ -592,13 +592,13 @@ impl<'a> Parser<'a> {
err.span_suggestion(
self.sess.source_map().next_point(eq).to(before_next),
"to constrain the associated type, add a type after `=`",
" TheType".to_string(),
" TheType",
Applicability::HasPlaceholders,
);
err.span_suggestion(
eq.to(before_next),
&format!("remove the `=` if `{}` is a type", ident),
String::new(),
"",
Applicability::MaybeIncorrect,
)
} else {

6
compiler/rustc_parse/src/parser/stmt.rs
View File

@ -209,7 +209,7 @@ impl<'a> Parser<'a> {
) -> PResult<'a, Stmt> {
let stmt = self.recover_local_after_let(lo, attrs)?;
self.struct_span_err(lo, "invalid variable declaration")
.span_suggestion(lo, msg, sugg.to_string(), Applicability::MachineApplicable)
.span_suggestion(lo, msg, sugg, Applicability::MachineApplicable)
.emit();
Ok(stmt)
}
@ -287,7 +287,7 @@ impl<'a> Parser<'a> {
err.span_suggestion_short(
colon_sp,
"use `=` if you meant to assign",
" =".to_string(),
" =",
Applicability::MachineApplicable,
);
err.emit();
@ -391,7 +391,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
self.token.span,
"initialize the variable",
"=".to_string(),
"=",
Applicability::MaybeIncorrect,
)
.help("if you meant to overwrite, remove the `let` binding")

8
compiler/rustc_parse/src/parser/ty.rs
View File

@ -216,7 +216,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
self.prev_token.span,
"use `->` instead",
"->".to_string(),
"->",
Applicability::MachineApplicable,
)
.emit();
@ -479,7 +479,7 @@ impl<'a> Parser<'a> {
err.span_suggestion(
span,
"place `mut` before `dyn`",
"&mut dyn".to_string(),
"&mut dyn",
Applicability::MachineApplicable,
);
err.emit();
@ -548,7 +548,7 @@ impl<'a> Parser<'a> {
.span_suggestion_short(
qual_span,
&format!("remove the `{}` qualifier", qual),
String::new(),
"",
Applicability::MaybeIncorrect,
)
.emit();
@ -648,7 +648,7 @@ impl<'a> Parser<'a> {
.span_suggestion(
self.token.span,
"remove this keyword",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();

12
compiler/rustc_passes/src/check_attr.rs
View File

@ -918,7 +918,7 @@ impl CheckAttrVisitor<'_> {
.span_suggestion(
replacement_span,
"remove this attribute",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -1158,7 +1158,7 @@ impl CheckAttrVisitor<'_> {
diag.span_suggestion_short(
i_meta.span,
"use `notable_trait` instead",
String::from("notable_trait"),
"notable_trait",
Applicability::MachineApplicable,
);
diag.note("`doc(spotlight)` is now a no-op");
@ -1720,7 +1720,7 @@ impl CheckAttrVisitor<'_> {
.span_suggestion(
attr.span,
"remove this attribute",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();
@ -2259,7 +2259,7 @@ impl CheckAttrVisitor<'_> {
.span_suggestion(
attr.span,
"remove this attribute",
String::new(),
"",
Applicability::MachineApplicable,
)
.note(&note)
@ -2487,7 +2487,7 @@ fn check_duplicates(
db.span_note(other, "attribute also specified here").span_suggestion(
this,
"remove this attribute",
String::new(),
"",
Applicability::MachineApplicable,
);
if matches!(duplicates, FutureWarnFollowing | FutureWarnPreceding) {
@ -2522,7 +2522,7 @@ fn check_duplicates(
.span_suggestion(
this,
"remove this attribute",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();

2
compiler/rustc_passes/src/loops.rs
View File

@ -166,7 +166,7 @@ impl<'a, 'hir> Visitor<'hir> for CheckLoopVisitor<'a, 'hir> {
break_expr.span,
"alternatively, you might have meant to use the \
available loop label",
label.ident.to_string(),
label.ident,
Applicability::MaybeIncorrect,
);
}

2
compiler/rustc_passes/src/naked_functions.rs
View File

@ -308,7 +308,7 @@ impl<'tcx> CheckInlineAssembly<'tcx> {
last_span,
"consider specifying that the asm block is responsible \
for returning from the function",
String::from(", options(noreturn)"),
", options(noreturn)",
Applicability::MachineApplicable,
)
.emit();

2
compiler/rustc_passes/src/stability.rs
View File

@ -125,7 +125,7 @@ impl<'a, 'tcx> Annotator<'a, 'tcx> {
.span_suggestion_short(
*span,
"remove the unnecessary deprecation attribute",
String::new(),
"",
rustc_errors::Applicability::MachineApplicable,
)
.emit();

19
compiler/rustc_resolve/src/diagnostics.rs
View File

@ -408,7 +408,7 @@ impl<'a> Resolver<'a> {
err.span_suggestion(
import.use_span_with_attributes,
message,
String::new(),
"",
Applicability::MaybeIncorrect,
);
}
@ -416,7 +416,7 @@ impl<'a> Resolver<'a> {
return;
}
err.span_suggestion(span, message, String::new(), Applicability::MachineApplicable);
err.span_suggestion(span, message, "", Applicability::MachineApplicable);
}
pub(crate) fn lint_if_path_starts_with_module(
@ -763,7 +763,7 @@ impl<'a> Resolver<'a> {
err.span_suggestion(
span,
"try using similarly named label",
ident.name.to_string(),
ident.name,
Applicability::MaybeIncorrect,
);
}
@ -796,7 +796,7 @@ impl<'a> Resolver<'a> {
err.span_suggestion(
span,
"consider importing the module directly",
"".to_string(),
"",
Applicability::MachineApplicable,
);
@ -1007,7 +1007,7 @@ impl<'a> Resolver<'a> {
err.span_suggestion(
span,
"try using similarly named label",
ident.name.to_string(),
ident.name,
Applicability::MaybeIncorrect,
);
}
@ -1618,12 +1618,7 @@ impl<'a> Resolver<'a> {
format!("maybe you meant this {}", suggestion.res.descr())
}
};
err.span_suggestion(
span,
&msg,
suggestion.candidate.to_string(),
Applicability::MaybeIncorrect,
);
err.span_suggestion(span, &msg, suggestion.candidate, Applicability::MaybeIncorrect);
true
}
@ -2535,7 +2530,7 @@ fn show_candidates(
err.span_suggestion_verbose(
first.ident.span.until(last.ident.span),
&format!("if you import `{}`, refer to it directly", last.ident),
String::new(),
"",
Applicability::Unspecified,
);
}

24
compiler/rustc_resolve/src/late/diagnostics.rs
View File

@ -280,7 +280,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion_verbose(
expr_span.shrink_to_lo(),
"you might have meant to use pattern matching",
"let ".to_string(),
"let ",
Applicability::MaybeIncorrect,
);
}
@ -294,7 +294,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion_short(
span,
"you might have meant to use `self` here instead",
"self".to_string(),
"self",
Applicability::MaybeIncorrect,
);
if !self.self_value_is_available(path[0].ident.span) {
@ -317,7 +317,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
span,
"if you meant to use `self`, you are also missing a `self` receiver \
argument",
sugg.to_string(),
sugg,
Applicability::MaybeIncorrect,
);
}
@ -376,7 +376,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion_verbose(
span,
"add a `self` receiver parameter to make the associated `fn` a method",
sugg.to_string(),
sugg,
Applicability::MaybeIncorrect,
);
"doesn't"
@ -612,7 +612,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion_short(
pat_sp.between(ty_sp),
"use `=` if you meant to assign",
" = ".to_string(),
" = ",
Applicability::MaybeIncorrect,
);
}
@ -642,7 +642,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion(
span,
"use the similarly named label",
label_ident.name.to_string(),
label_ident.name,
Applicability::MaybeIncorrect,
);
// Do not lint against unused label when we suggest them.
@ -656,7 +656,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion(
span,
"perhaps you intended to use this type",
correct.to_string(),
correct,
Applicability::MaybeIncorrect,
);
}
@ -687,7 +687,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion_verbose(
constraint.ident.span.between(trait_ref.span),
"you might have meant to write a path instead of an associated type bound",
"::".to_string(),
"::",
Applicability::MachineApplicable,
);
}
@ -1079,7 +1079,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion_verbose(
span.shrink_to_hi(),
"use `!` to invoke the macro",
"!".to_string(),
"!",
Applicability::MaybeIncorrect,
);
if path_str == "try" && span.rust_2015() {
@ -1228,7 +1228,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion(
span,
"use this syntax instead",
path_str.to_string(),
path_str,
Applicability::MaybeIncorrect,
);
}
@ -1507,7 +1507,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion_short(
colon_sp,
"maybe you meant to write `;` here",
";".to_string(),
";",
Applicability::MaybeIncorrect,
);
} else {
@ -1518,7 +1518,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
err.span_suggestion(
colon_sp,
"maybe you meant to write a path separator here",
"::".to_string(),
"::",
Applicability::MaybeIncorrect,
);
show_label = false;

2
compiler/rustc_trait_selection/src/traits/const_evaluatable.rs
View File

@ -144,7 +144,7 @@ pub fn is_const_evaluatable<'cx, 'tcx>(
.span_suggestion_verbose(
rustc_span::DUMMY_SP,
"consider enabling this feature",
"#![feature(generic_const_exprs)]\n".to_string(),
"#![feature(generic_const_exprs)]\n",
rustc_errors::Applicability::MaybeIncorrect,
)
.emit()

4
compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
View File

@ -417,7 +417,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
span.shrink_to_lo(),
"consider converting the `Option<T>` into a `Result<T, _>` \
using `Option::ok_or` or `Option::ok_or_else`",
".ok_or_else(|| /* error value */)".to_string(),
".ok_or_else(|| /* error value */)",
Applicability::HasPlaceholders,
);
} else if should_convert_result_to_option {
@ -425,7 +425,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
span.shrink_to_lo(),
"consider converting the `Result<T, _>` into an `Option<T>` \
using `Result::ok`",
".ok()".to_string(),
".ok()",
Applicability::MachineApplicable,
);
}

35
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View File

@ -701,7 +701,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_lo(),
"consider dereferencing here",
"*".to_string(),
"*",
Applicability::MachineApplicable,
);
return true;
@ -1002,7 +1002,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
&format!(
"consider borrowing the value, since `&{self_ty}` can be coerced into `{object_ty}`"
),
"&".to_string(),
"&",
Applicability::MaybeIncorrect,
);
}
@ -1059,12 +1059,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
format!("consider removing {} leading `&`-references", remove_refs)
};
err.span_suggestion_short(
sp,
&msg,
String::new(),
Applicability::MachineApplicable,
);
err.span_suggestion_short(sp, &msg, "", Applicability::MachineApplicable);
suggested = true;
break;
}
@ -1087,7 +1082,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
expr.span.shrink_to_hi().with_hi(span.hi()),
"remove the `.await`",
String::new(),
"",
Applicability::MachineApplicable,
);
// FIXME: account for associated `async fn`s.
@ -1115,14 +1110,14 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_lo(),
&msg,
"async ".to_string(),
"async ",
Applicability::MaybeIncorrect,
);
} else {
err.span_suggestion_verbose(
vis_span.shrink_to_hi(),
&msg,
" async".to_string(),
" async",
Applicability::MaybeIncorrect,
);
}
@ -1190,7 +1185,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
sp,
"consider changing this borrow's mutability",
"&mut ".to_string(),
"&mut ",
Applicability::MachineApplicable,
);
} else {
@ -1241,7 +1236,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion(
self.tcx.sess.source_map().end_point(stmt.span),
"remove this semicolon",
String::new(),
"",
Applicability::MachineApplicable
);
return true;
@ -2275,7 +2270,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_lo(),
"consider borrowing here",
"&".to_owned(),
"&",
Applicability::MachineApplicable,
);
err.note("all local variables must have a statically known size");
@ -2285,7 +2280,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
param.ty_span.shrink_to_lo(),
"function arguments must have a statically known size, borrowed types \
always have a known size",
"&".to_owned(),
"&",
Applicability::MachineApplicable,
);
}
@ -2303,7 +2298,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
span.shrink_to_lo(),
"function arguments must have a statically known size, borrowed types \
always have a known size",
"&".to_string(),
"&",
Applicability::MachineApplicable,
);
} else {
@ -2358,7 +2353,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion(
span.shrink_to_lo(),
"borrowed types always have a statically known size",
"&".to_string(),
"&",
Applicability::MachineApplicable,
);
err.multipart_suggestion(
@ -2759,7 +2754,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span.with_hi(span.hi() - BytePos(1)).shrink_to_hi(),
"consider `await`ing on the `Future`",
".await".to_string(),
".await",
Applicability::MaybeIncorrect,
);
}
@ -2785,7 +2780,7 @@ impl<'a, 'tcx> InferCtxtExt<'tcx> for InferCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
rhs_span.shrink_to_hi(),
"consider using a floating-point literal by writing it with `.0`",
String::from(".0"),
".0",
Applicability::MaybeIncorrect,
);
}
@ -2965,7 +2960,7 @@ fn suggest_trait_object_return_type_alternatives(
ret_ty,
"use some type `T` that is `T: Sized` as the return type if all return paths have the \
same type",
"T".to_string(),
"T",
Applicability::MaybeIncorrect,
);
err.span_suggestion(

2
compiler/rustc_typeck/src/astconv/errors.rs
View File

@ -161,7 +161,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
err.span_suggestion(
assoc_name.span,
"there is an associated type with a similar name",
suggested_name.to_string(),
suggested_name,
Applicability::MaybeIncorrect,
);
} else {

12
compiler/rustc_typeck/src/astconv/mod.rs
View File

@ -1589,7 +1589,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
err.span_suggestion(
span.shrink_to_lo(),
"you are looking for the module in `std`, not the primitive type",
"std::".to_string(),
"std::",
Applicability::MachineApplicable,
);
} else {
@ -1820,7 +1820,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
err.span_suggestion_verbose(
args_span,
&format!("{type_name} doesn't have generic parameters"),
String::new(),
"",
Applicability::MachineApplicable,
);
return;
@ -1946,7 +1946,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
err.span_suggestion(
assoc_ident.span,
"there is a variant with a similar name",
suggested_name.to_string(),
suggested_name,
Applicability::MaybeIncorrect,
);
} else {
@ -2422,7 +2422,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
err.span_suggestion_verbose(
ident.span.shrink_to_hi().to(args.span_ext),
"the `Self` type doesn't accept type parameters",
String::new(),
"",
Applicability::MaybeIncorrect,
);
}
@ -2473,7 +2473,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
err.span_suggestion_verbose(
segment.ident.span.shrink_to_hi().to(args.span_ext),
"the `Self` type doesn't accept type parameters",
String::new(),
"",
Applicability::MachineApplicable,
);
return;
@ -2549,7 +2549,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
err.span_suggestion_verbose(
segment.ident.span.shrink_to_hi().to(args.span_ext),
&format!("primitive type `{name}` doesn't have generic parameters"),
String::new(),
"",
Applicability::MaybeIncorrect,
);
}

6
compiler/rustc_typeck/src/check/callee.rs
View File

@ -319,7 +319,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
start,
"consider separating array elements with a comma",
",".to_string(),
",",
Applicability::MaybeIncorrect,
);
return true;
@ -406,7 +406,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
&format!(
"`{path}` is a unit variant, you need to write it without the parentheses",
),
String::new(),
"",
Applicability::MachineApplicable,
);
}
@ -426,7 +426,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
callee_expr.span.shrink_to_hi(),
"consider using a semicolon here",
";".to_owned(),
";",
Applicability::MaybeIncorrect,
);
}

4
compiler/rustc_typeck/src/check/compare_method.rs
View File

@ -354,7 +354,7 @@ fn compare_predicate_entailment<'tcx>(
diag.span_suggestion_verbose(sp, msg, sugg, ap);
}
hir::FnRetTy::Return(hir_ty) => {
let sugg = trait_sig.output().to_string();
let sugg = trait_sig.output();
diag.span_suggestion(hir_ty.span, msg, sugg, ap);
}
};
@ -365,7 +365,7 @@ fn compare_predicate_entailment<'tcx>(
diag.span_suggestion(
impl_err_span,
"change the parameter type to match the trait",
trait_ty.to_string(),
trait_ty,
Applicability::MachineApplicable,
);
}

16
compiler/rustc_typeck/src/check/expr.rs
View File

@ -864,7 +864,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
expr.span.shrink_to_lo(),
"you might have meant to use pattern destructuring",
"let ".to_string(),
"let ",
Applicability::MachineApplicable,
);
});
@ -1042,7 +1042,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
expr.span.shrink_to_lo(),
"you might have meant to use pattern matching",
"let ".to_string(),
"let ",
applicability,
);
};
@ -1051,7 +1051,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span,
"you might have meant to compare for equality",
"==".to_string(),
"==",
applicability,
);
}
@ -1086,7 +1086,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
lhs.span.shrink_to_lo(),
"consider dereferencing here to assign to the mutably borrowed value",
"*".to_string(),
"*",
Applicability::MachineApplicable,
);
}
@ -1790,7 +1790,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
range_start.span.shrink_to_hi(),
&format!("to set the remaining fields{instead}, separate the last named field with a comma"),
",".to_string(),
",",
Applicability::MaybeIncorrect,
);
}
@ -1912,7 +1912,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
field.ident.span,
"a field with a similar name exists",
field_name.to_string(),
field_name,
Applicability::MaybeIncorrect,
);
} else {
@ -2158,7 +2158,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
base.span.shrink_to_hi(),
"consider `await`ing on the `Future` and access the field of its `Output`",
".await".to_string(),
".await",
Applicability::MaybeIncorrect,
);
}
@ -2358,7 +2358,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
field.span,
"a field with a similar name exists",
suggested_field_name.to_string(),
suggested_field_name,
Applicability::MaybeIncorrect,
);
} else {

2
compiler/rustc_typeck/src/check/fn_ctxt/_impl.rs
View File

@ -1310,7 +1310,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
span,
"use curly brackets",
String::from("Self { /* fields */ }"),
"Self { /* fields */ }",
Applicability::HasPlaceholders,
);
}

4
compiler/rustc_typeck/src/check/fn_ctxt/checks.rs
View File

@ -1458,14 +1458,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span_semi,
"consider removing this semicolon and boxing the expression",
String::new(),
"",
Applicability::HasPlaceholders,
);
} else {
err.span_suggestion_short(
span_semi,
"remove this semicolon",
String::new(),
"",
Applicability::MachineApplicable,
);
}

6
compiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs
View File

@ -27,7 +27,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_short(
span.shrink_to_hi(),
"consider using a semicolon here",
";".to_string(),
";",
Applicability::MachineApplicable,
);
}
@ -444,7 +444,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
fn_name.span,
"use `Box::pin` to pin and box this expression",
"Box::pin".to_string(),
"Box::pin",
Applicability::MachineApplicable,
);
true
@ -507,7 +507,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
expression.span.shrink_to_hi(),
"consider using a semicolon here",
";".to_string(),
";",
Applicability::MachineApplicable,
);
}

25
compiler/rustc_typeck/src/check/method/suggest.rs
View File

@ -330,7 +330,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
span.shrink_to_lo(),
"you are looking for the module in `std`, not the primitive type",
"std::".to_string(),
"std::",
Applicability::MachineApplicable,
);
}
@ -453,7 +453,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_short(
span,
msg,
String::from("len"),
"len",
Applicability::MachineApplicable,
);
} else {
@ -893,7 +893,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
item_name.span,
"because of the in-memory representation of `&str`, to obtain \
an `Iterator` over each of its codepoint use method `chars`",
String::from("chars"),
"chars",
Applicability::MachineApplicable,
);
}
@ -1006,7 +1006,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
span,
"there is a variant with a similar name",
suggestion.to_string(),
suggestion,
Applicability::MaybeIncorrect,
);
}
@ -1019,12 +1019,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let call_expr =
self.tcx.hir().expect_expr(self.tcx.hir().get_parent_node(expr.hir_id));
if let Some(span) = call_expr.span.trim_start(expr.span) {
err.span_suggestion(
span,
msg,
String::new(),
Applicability::MachineApplicable,
);
err.span_suggestion(span, msg, "", Applicability::MachineApplicable);
fallback_span = false;
}
}
@ -1043,7 +1038,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
def_kind.article(),
def_kind.descr(lev_candidate.def_id),
),
lev_candidate.name.to_string(),
lev_candidate.name,
Applicability::MaybeIncorrect,
);
}
@ -1164,7 +1159,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
span,
"remove the arguments",
String::new(),
"",
Applicability::MaybeIncorrect,
);
}
@ -1418,7 +1413,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
"use the `?` operator to extract the `{self_ty}` value, propagating \
{article} `{kind}::{variant}` value to the caller"
),
"?".to_owned(),
"?",
Applicability::MachineApplicable,
);
} else {
@ -1428,7 +1423,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
"consider using `{kind}::expect` to unwrap the `{self_ty}` value, \
panicking if the value is {article} `{kind}::{variant}`"
),
".expect(\"REASON\")".to_owned(),
".expect(\"REASON\")",
Applicability::HasPlaceholders,
);
}
@ -1632,7 +1627,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span.shrink_to_lo(),
"consider `await`ing on the `Future` and calling the method on its `Output`",
"await.".to_string(),
"await.",
Applicability::MaybeIncorrect,
);
}

6
compiler/rustc_typeck/src/check/op.rs
View File

@ -446,7 +446,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
lhs_expr.span.shrink_to_lo(),
msg,
"*".to_string(),
"*",
rustc_errors::Applicability::MachineApplicable,
);
}
@ -621,14 +621,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
lhs_expr.span.until(lhs_inner_expr.span),
rm_borrow_msg,
"".to_owned(),
"",
Applicability::MachineApplicable
);
} else {
err.span_suggestion_verbose(
lhs_expr.span.shrink_to_hi(),
to_owned_msg,
".to_owned()".to_owned(),
".to_owned()",
Applicability::MachineApplicable
);
}

12
compiler/rustc_typeck/src/check/pat.rs
View File

@ -1150,14 +1150,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
all_fields_span,
"use `..` to ignore all fields",
String::from(".."),
"..",
Applicability::MaybeIncorrect,
);
} else {
err.span_suggestion_verbose(
tail_span,
"use `..` to ignore the rest of the fields",
String::from(", .."),
", ..",
Applicability::MaybeIncorrect,
);
}
@ -1428,7 +1428,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
sp_comma,
"add `..` at the end of the field list to ignore all other fields",
sugg.to_string(),
sugg,
Applicability::MachineApplicable,
);
err.emit();
@ -1502,7 +1502,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion(
pat_field.ident.span,
"a field with a similar name exists",
suggested_name.to_string(),
suggested_name,
Applicability::MaybeIncorrect,
);
@ -1655,7 +1655,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
field.span.shrink_to_hi(),
"ignore the inaccessible and unused fields",
", ..".to_string(),
", ..",
Applicability::MachineApplicable,
);
} else {
@ -1670,7 +1670,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
err.span_suggestion_verbose(
span,
"ignore the inaccessible and unused fields",
" { .. }".to_string(),
" { .. }",
Applicability::MachineApplicable,
);
}

2
compiler/rustc_typeck/src/check_unused.rs
View File

@ -122,7 +122,7 @@ fn unused_crates_lint(tcx: TyCtxt<'_>) {
.span_suggestion_short(
span_with_attrs,
"remove it",
String::new(),
"",
Applicability::MachineApplicable,
)
.emit();

6
compiler/rustc_typeck/src/collect.rs
View File

@ -1930,7 +1930,7 @@ fn infer_return_ty_for_fn_sig<'tcx>(
diag.span_suggestion(
ty.span,
"replace with the correct return type",
ret_ty.to_string(),
ret_ty,
Applicability::MachineApplicable,
);
} else if matches!(ret_ty.kind(), ty::FnDef(..)) {
@ -1939,7 +1939,7 @@ fn infer_return_ty_for_fn_sig<'tcx>(
diag.span_suggestion(
ty.span,
"replace with the correct return type",
fn_sig.to_string(),
fn_sig,
Applicability::MachineApplicable,
);
}
@ -2584,7 +2584,7 @@ fn from_target_feature(
let Some(list) = attr.meta_item_list() else { return };
let bad_item = |span| {
let msg = "malformed `target_feature` attribute input";
let code = "enable = \"..\"".to_owned();
let code = "enable = \"..\"";
tcx.sess
.struct_span_err(span, msg)
.span_suggestion(span, "must be of the form", code, Applicability::HasPlaceholders)

2
compiler/rustc_typeck/src/collect/type_of.rs
View File

@ -756,7 +756,7 @@ fn infer_placeholder_type<'a>(
diag.span_suggestion(
span,
"replace with the correct type",
sugg_ty.to_string(),
sugg_ty,
Applicability::MaybeIncorrect,
);
} else {

6
compiler/rustc_typeck/src/structured_errors/wrong_number_of_generic_args.rs
View File

@ -715,7 +715,7 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
err.span_suggestion(
span_redundant_lt_args,
&msg_lifetimes,
String::new(),
"",
Applicability::MaybeIncorrect,
);
};
@ -757,7 +757,7 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
err.span_suggestion(
span_redundant_type_or_const_args,
&msg_types_or_consts,
String::new(),
"",
Applicability::MaybeIncorrect,
);
};
@ -797,7 +797,7 @@ impl<'a, 'tcx> WrongNumberOfGenericArgs<'a, 'tcx> {
if self.gen_args.parenthesized { "parenthetical " } else { "" },
);
err.span_suggestion(span, &msg, String::new(), Applicability::MaybeIncorrect);
err.span_suggestion(span, &msg, "", Applicability::MaybeIncorrect);
} else if redundant_lifetime_args && redundant_type_or_const_args {
remove_lifetime_args(err);
remove_type_or_const_args(err);

2
src/librustdoc/passes/check_code_block_syntax.rs
View File

@ -122,7 +122,7 @@ impl<'a, 'tcx> SyntaxChecker<'a, 'tcx> {
diag.span_suggestion(
sp.from_inner(InnerSpan::new(0, 3)).shrink_to_hi(),
explanation,
String::from("text"),
"text",
Applicability::MachineApplicable,
);
}

2
src/tools/clippy/clippy_lints/src/almost_complete_letter_range.rs
View File

@ -90,7 +90,7 @@ fn check_range(cx: &EarlyContext<'_>, span: Span, start: &Expr, end: &Expr, sugg
diag.span_suggestion(
span,
"use an inclusive range",
sugg.to_owned(),
sugg,
Applicability::MaybeIncorrect,
);
}

2
src/tools/clippy/clippy_lints/src/as_underscore.rs
View File

@ -63,7 +63,7 @@ impl<'tcx> LateLintPass<'tcx> for AsUnderscore {
diag.span_suggestion(
ty.span,
"consider giving the type explicitly",
format!("{}", ty_resolved),
ty_resolved,
Applicability::MachineApplicable,
);
}

2
src/tools/clippy/clippy_lints/src/empty_structs_with_brackets.rs
View File

@ -44,7 +44,7 @@ impl EarlyLintPass for EmptyStructsWithBrackets {
diagnostic.span_suggestion_hidden(
span_after_ident,
"remove the brackets",
";".to_string(),
";",
Applicability::MachineApplicable);
},
);

2
src/tools/clippy/clippy_lints/src/large_const_arrays.rs
View File

@ -75,7 +75,7 @@ impl<'tcx> LateLintPass<'tcx> for LargeConstArrays {
diag.span_suggestion(
sugg_span,
"make this a static item",
"static".to_string(),
"static",
Applicability::MachineApplicable,
);
}

2
src/tools/clippy/clippy_lints/src/manual_async_fn.rs
View File

@ -86,7 +86,7 @@ impl<'tcx> LateLintPass<'tcx> for ManualAsyncFn {
diag.span_suggestion(
block.span,
"move the body of the async block to the enclosing function",
body_snip.to_string(),
body_snip,
Applicability::MachineApplicable
);
}

2
src/tools/clippy/clippy_lints/src/matches/match_same_arms.rs
View File

@ -113,7 +113,7 @@ pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, arms: &'tcx [Arm<'_>]) {
diag.span_suggestion(
arm1.span,
"try removing the arm",
String::new(),
"",
Applicability::MaybeIncorrect,
)
.help("or try changing either arm body")

4
src/tools/clippy/clippy_lints/src/methods/str_splitn.rs
View File

@ -176,13 +176,13 @@ fn check_manual_split_once_indirect(
diag.span_suggestion(
first.span,
&remove_msg,
String::new(),
"",
app,
);
diag.span_suggestion(
second.span,
&remove_msg,
String::new(),
"",
app,
);
});

2
src/tools/clippy/clippy_lints/src/methods/unnecessary_iter_cloned.rs
View File

@ -85,7 +85,7 @@ pub fn check_for_loop_iter(
match addr_of_expr.kind {
ExprKind::AddrOf(_, _, referent) => {
let span = addr_of_expr.span.with_hi(referent.span.lo());
diag.span_suggestion(span, "remove this `&`", String::new(), applicability);
diag.span_suggestion(span, "remove this `&`", "", applicability);
}
_ => unreachable!(),
}

4
src/tools/clippy/clippy_lints/src/needless_late_init.rs
View File

@ -318,7 +318,7 @@ fn check<'tcx>(
diag.span_suggestion(
usage.stmt.span.shrink_to_hi(),
"add a semicolon after the `if` expression",
";".to_string(),
";",
applicability,
);
}
@ -353,7 +353,7 @@ fn check<'tcx>(
diag.span_suggestion(
usage.stmt.span.shrink_to_hi(),
"add a semicolon after the `match` expression",
";".to_string(),
";",
applicability,
);
}

2
src/tools/clippy/clippy_lints/src/needless_pass_by_value.rs
View File

@ -258,7 +258,7 @@ impl<'tcx> LateLintPass<'tcx> for NeedlessPassByValue {
diag.span_suggestion(
input.span,
"consider changing the type to",
"&str".to_string(),
"&str",
Applicability::Unspecified,
);

2
src/tools/clippy/clippy_lints/src/redundant_clone.rs
View File

@ -255,7 +255,7 @@ impl<'tcx> LateLintPass<'tcx> for RedundantClone {
diag.span_suggestion(
sugg_span,
"remove this",
String::new(),
"",
app,
);
if clone_usage.cloned_used {

2
src/tools/clippy/clippy_lints/src/transmute/transmute_float_to_int.rs
View File

@ -55,7 +55,7 @@ pub(super) fn check<'tcx>(
sugg
};
diag.span_suggestion(e.span, "consider using", sugg.to_string(), Applicability::Unspecified);
diag.span_suggestion(e.span, "consider using", sugg, Applicability::Unspecified);
},
);
true

2
src/tools/clippy/clippy_lints/src/transmute/transmute_ptr_to_ptr.rs
View File

@ -25,7 +25,7 @@ pub(super) fn check<'tcx>(
|diag| {
if let Some(arg) = sugg::Sugg::hir_opt(cx, arg) {
let sugg = arg.as_ty(cx.tcx.mk_ptr(*to_ty));
diag.span_suggestion(e.span, "try", sugg.to_string(), Applicability::Unspecified);
diag.span_suggestion(e.span, "try", sugg, Applicability::Unspecified);
}
},
);

2
src/tools/clippy/clippy_lints/src/transmute/transmute_ref_to_ref.rs
View File

@ -73,7 +73,7 @@ pub(super) fn check<'tcx>(
diag.span_suggestion(
e.span,
"try",
sugg.to_string(),
sugg,
Applicability::Unspecified,
);
},

4
src/tools/clippy/clippy_lints/src/transmute/useless_transmute.rs
View File

@ -46,7 +46,7 @@ pub(super) fn check<'tcx>(
arg.as_ty(cx.tcx.mk_ptr(rty_and_mut)).as_ty(to_ty)
};
diag.span_suggestion(e.span, "try", sugg.to_string(), Applicability::Unspecified);
diag.span_suggestion(e.span, "try", sugg, Applicability::Unspecified);
}
},
);
@ -64,7 +64,7 @@ pub(super) fn check<'tcx>(
diag.span_suggestion(
e.span,
"try",
arg.as_ty(&to_ty.to_string()).to_string(),
arg.as_ty(&to_ty.to_string()),
Applicability::Unspecified,
);
}

2
src/tools/clippy/clippy_utils/src/attrs.rs
View File

@ -92,7 +92,7 @@ pub fn get_attr<'a>(
diag.span_suggestion(
attr_segments[1].ident.span,
"consider using",
new_name.to_string(),
new_name,
Applicability::MachineApplicable,
);
diag.emit();