Rollup merge of #121231 - matthiaskrgr:cloone, r=compiler-errors
remove a couple of redundant clones
This commit is contained in:
commit
eafa74ab62
4 changed files with 6 additions and 6 deletions
|
@ -311,7 +311,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
|||
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
|
||||
{
|
||||
|
|
|
@ -452,7 +452,6 @@ impl<'a> Parser<'a> {
|
|||
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 @@ impl<'a> Parser<'a> {
|
|||
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 @@ impl<'a> Parser<'a> {
|
|||
}
|
||||
false
|
||||
})
|
||||
.cloned()
|
||||
.collect::<Vec<_>>();
|
||||
expected.sort_by_cached_key(|x| x.to_string());
|
||||
expected.dedup();
|
||||
|
|
|
@ -893,7 +893,7 @@ impl<'a> Parser<'a> {
|
|||
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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue