languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-01 14:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #121231 - matthiaskrgr:cloone, r=compiler-errors

Browse source 
remove a couple of redundant clones
This commit is contained in:
Matthias Krüger 2024-02-17 18:47:43 +01:00 committed by GitHub
parent 4ddc8e4368 87b6f415f2
commit eafa74ab62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_hir_typeck/src/_match.rs
View file

@ -311,7 +311,7 @@ fn explain_if_expr(
error: &mut bool,
) {
if let Some((if_span, msg)) = ret_reason {
err.span_label(if_span, msg.clone());
err.span_label(if_span, msg);
} else if let ExprKind::Block(block, _) = then_expr.kind
&& let Some(expr) = block.expr
{

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

@ -452,7 +452,6 @@ fn tokens_to_string(tokens: &[TokenType]) -> String {
let mut expected = self
.expected_tokens
.iter()
.cloned()
.filter(|token| {
// Filter out suggestions that suggest the same token which was found and deemed incorrect.
fn is_ident_eq_keyword(found: &TokenKind, expected: &TokenType) -> bool {
@ -464,7 +463,7 @@ fn is_ident_eq_keyword(found: &TokenKind, expected: &TokenType) -> bool {
false
}
if *token != parser::TokenType::Token(self.token.kind.clone()) {
if **token != parser::TokenType::Token(self.token.kind.clone()) {
let eq = is_ident_eq_keyword(&self.token.kind, &token);
// If the suggestion is a keyword and the found token is an ident,
// the content of which are equal to the suggestion's content,
@ -483,6 +482,7 @@ fn is_ident_eq_keyword(found: &TokenKind, expected: &TokenType) -> bool {
}
false
})
.cloned()
.collect::<Vec<_>>();
expected.sort_by_cached_key(|x| x.to_string());
expected.dedup();

2
compiler/rustc_parse_format/src/lib.rs
View file

@ -893,7 +893,7 @@ fn suggest_format_align(&mut self, alignment: char) {
ParseError {
description: "expected format parameter to occur after `:`".to_owned(),
note: None,
label: format!("expected `{}` to occur after `:`", alignment).to_owned(),
label: format!("expected `{}` to occur after `:`", alignment),
span: pos.to(pos),
secondary_label: None,
suggestion: Suggestion::None,

4
src/tools/clippy/clippy_utils/src/diagnostics.rs
View file

@ -84,9 +84,9 @@ pub fn span_lint_and_help<T: LintContext>(
cx.span_lint(lint, span, msg.to_string(), |diag| {
let help = help.to_string();
if let Some(help_span) = help_span {
diag.span_help(help_span, help.to_string());
diag.span_help(help_span, help);
} else {
diag.help(help.to_string());
diag.help(help);
}
docs_link(diag, lint);
});