Skip to content

Commit 21b4e91

Browse files
bors[bot]kjeremy
andauthored
Merge #5440
5440: Minor perf tweaks per clippy r=matklad a=kjeremy Co-authored-by: Jeremy Kolb <[email protected]>
2 parents 7a089a7 + 17f4d27 commit 21b4e91

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

crates/ra_assists/src/handlers/raw_string.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ pub(crate) fn remove_hash(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
131131
let token = ctx.find_token_at_offset(RAW_STRING).and_then(ast::RawString::cast)?;
132132

133133
let text = token.text().as_str();
134-
if !text.starts_with("r#") && text.ends_with("#") {
134+
if !text.starts_with("r#") && text.ends_with('#') {
135135
return None;
136136
}
137137

crates/ra_assists/src/handlers/replace_qualified_name_with_use.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ fn maybe_replace_path(
106106
path: ast::Path,
107107
target: ast::Path,
108108
) -> Option<()> {
109-
if !path_eq(path.clone(), target.clone()) {
109+
if !path_eq(path.clone(), target) {
110110
return None;
111111
}
112112

crates/ra_hir_ty/src/lower.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ impl Ty {
341341
let segment = remaining_segments.first().unwrap();
342342
let found = associated_type_by_name_including_super_traits(
343343
ctx.db,
344-
trait_ref.clone(),
344+
trait_ref,
345345
&segment.name,
346346
);
347347
match found {

crates/ra_ide/src/completion/completion_context.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ impl<'a> CompletionContext<'a> {
215215

216216
fn fill_keyword_patterns(&mut self, file_with_fake_ident: &SyntaxNode, offset: TextSize) {
217217
let fake_ident_token = file_with_fake_ident.token_at_offset(offset).right_biased().unwrap();
218-
let syntax_element = NodeOrToken::Token(fake_ident_token.clone());
218+
let syntax_element = NodeOrToken::Token(fake_ident_token);
219219
self.block_expr_parent = has_block_expr_parent(syntax_element.clone());
220220
self.unsafe_is_prev = unsafe_is_prev(syntax_element.clone());
221221
self.if_is_prev = if_is_prev(syntax_element.clone());
@@ -228,7 +228,7 @@ impl<'a> CompletionContext<'a> {
228228
self.trait_as_prev_sibling = has_trait_as_prev_sibling(syntax_element.clone());
229229
self.is_match_arm = is_match_arm(syntax_element.clone());
230230
self.has_item_list_or_source_file_parent =
231-
has_item_list_or_source_file_parent(syntax_element.clone());
231+
has_item_list_or_source_file_parent(syntax_element);
232232
}
233233

234234
fn fill(

crates/ra_ide/src/diagnostics.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ fn missing_struct_field_fix(
183183
}
184184
new_field = format!("\n{}{}", indent, new_field);
185185

186-
let needs_comma = !last_field_syntax.to_string().ends_with(",");
186+
let needs_comma = !last_field_syntax.to_string().ends_with(',');
187187
if needs_comma {
188188
new_field = format!(",{}", new_field);
189189
}

crates/ra_ide/src/inlay_hints.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ fn get_param_name_hints(
171171
.map(|(param_name, arg)| InlayHint {
172172
range: arg.syntax().text_range(),
173173
kind: InlayKind::ParameterHint,
174-
label: param_name.to_string().into(),
174+
label: param_name.into(),
175175
});
176176

177177
acc.extend(hints);

crates/rust-analyzer/src/reload.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ impl GlobalState {
242242
})
243243
.map(move |cargo| {
244244
let cargo_project_root = cargo.workspace_root().to_path_buf();
245-
FlycheckHandle::spawn(sender, config.clone(), cargo_project_root.into())
245+
FlycheckHandle::spawn(sender, config, cargo_project_root.into())
246246
})
247247
}
248248
}

0 commit comments

Comments
 (0)