mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-25 16:24:46 +00:00
rustc: minor changes suggested by clippy perf lints.
This commit is contained in:
parent
9bd71afb90
commit
1b3733e5a4
@ -2362,11 +2362,7 @@ impl FileWithAnnotatedLines {
|
||||
|
||||
let label = label.as_ref().map(|m| {
|
||||
normalize_whitespace(
|
||||
&emitter
|
||||
.translate_message(m, &args)
|
||||
.map_err(Report::new)
|
||||
.unwrap()
|
||||
.to_string(),
|
||||
&emitter.translate_message(m, &args).map_err(Report::new).unwrap(),
|
||||
)
|
||||
});
|
||||
|
||||
|
@ -274,7 +274,7 @@ pub fn suggest_constraining_type_params<'a>(
|
||||
span,
|
||||
if span_to_replace.is_some() {
|
||||
constraint.clone()
|
||||
} else if constraint.starts_with("<") {
|
||||
} else if constraint.starts_with('<') {
|
||||
constraint.to_string()
|
||||
} else if bound_list_non_empty {
|
||||
format!(" + {constraint}")
|
||||
|
@ -1545,7 +1545,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
|
||||
let (span, sugg, post) = if let SuggestionTarget::SimilarlyNamed = suggestion.target
|
||||
&& let Ok(snippet) = self.tcx.sess.source_map().span_to_snippet(span)
|
||||
&& let Some(span) = suggestion.span
|
||||
&& let Some(candidate) = suggestion.candidate.as_str().strip_prefix("_")
|
||||
&& let Some(candidate) = suggestion.candidate.as_str().strip_prefix('_')
|
||||
&& snippet == candidate
|
||||
{
|
||||
// When the suggested binding change would be from `x` to `_x`, suggest changing the
|
||||
|
@ -2477,7 +2477,7 @@ pub fn parse_externs(
|
||||
let mut error = handler.early_struct_error(format!(
|
||||
"crate name `{name}` passed to `--extern` is not a valid ASCII identifier"
|
||||
));
|
||||
let adjusted_name = name.replace("-", "_");
|
||||
let adjusted_name = name.replace('-', "_");
|
||||
if crate::utils::is_ascii_ident(&adjusted_name) {
|
||||
error.help(format!(
|
||||
"consider replacing the dashes with underscores: `{adjusted_name}`"
|
||||
|
Loading…
Reference in New Issue
Block a user