Skip to content

Commit 4958a95

Browse files
GearsDatapackslpil
authored andcommitted
Remove unnecessary clones
1 parent 5a66f5a commit 4958a95

File tree

1 file changed

+18
-12
lines changed

1 file changed

+18
-12
lines changed

compiler-core/src/language_server/code_action.rs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,12 +1330,16 @@ impl QualifiedConstructor<'_> {
13301330
pub struct QualifiedToUnqualifiedImportFirstPass<'a> {
13311331
module: &'a Module,
13321332
params: &'a CodeActionParams,
1333-
line_numbers: LineNumbers,
1333+
line_numbers: &'a LineNumbers,
13341334
qualified_constructor: Option<QualifiedConstructor<'a>>,
13351335
}
13361336

13371337
impl<'a> QualifiedToUnqualifiedImportFirstPass<'a> {
1338-
fn new(module: &'a Module, params: &'a CodeActionParams, line_numbers: LineNumbers) -> Self {
1338+
fn new(
1339+
module: &'a Module,
1340+
params: &'a CodeActionParams,
1341+
line_numbers: &'a LineNumbers,
1342+
) -> Self {
13391343
Self {
13401344
module,
13411345
params,
@@ -1854,8 +1858,7 @@ pub fn code_action_convert_qualified_constructor_to_unqualified(
18541858
params: &CodeActionParams,
18551859
actions: &mut Vec<CodeAction>,
18561860
) {
1857-
let mut first_pass =
1858-
QualifiedToUnqualifiedImportFirstPass::new(module, params, line_numbers.clone());
1861+
let mut first_pass = QualifiedToUnqualifiedImportFirstPass::new(module, params, line_numbers);
18591862
first_pass.visit_typed_module(&module.ast);
18601863
let Some(qualified_constructor) = first_pass.qualified_constructor else {
18611864
return;
@@ -1879,12 +1882,16 @@ struct UnqualifiedConstructor<'a> {
18791882
struct UnqualifiedToQualifiedImportFirstPass<'a> {
18801883
module: &'a Module,
18811884
params: &'a CodeActionParams,
1882-
line_numbers: LineNumbers,
1885+
line_numbers: &'a LineNumbers,
18831886
unqualified_constructor: Option<UnqualifiedConstructor<'a>>,
18841887
}
18851888

18861889
impl<'a> UnqualifiedToQualifiedImportFirstPass<'a> {
1887-
fn new(module: &'a Module, params: &'a CodeActionParams, line_numbers: LineNumbers) -> Self {
1890+
fn new(
1891+
module: &'a Module,
1892+
params: &'a CodeActionParams,
1893+
line_numbers: &'a LineNumbers,
1894+
) -> Self {
18881895
Self {
18891896
module,
18901897
params,
@@ -2272,8 +2279,7 @@ pub fn code_action_convert_unqualified_constructor_to_qualified(
22722279
params: &CodeActionParams,
22732280
actions: &mut Vec<CodeAction>,
22742281
) {
2275-
let mut first_pass =
2276-
UnqualifiedToQualifiedImportFirstPass::new(module, params, line_numbers.clone());
2282+
let mut first_pass = UnqualifiedToQualifiedImportFirstPass::new(module, params, line_numbers);
22772283
first_pass.visit_typed_module(&module.ast);
22782284
let Some(unqualified_constructor) = first_pass.unqualified_constructor else {
22792285
return;
@@ -2944,7 +2950,7 @@ impl<'ast> ast::visit::Visit<'ast> for ExtractVariable<'ast> {
29442950
finally: &'ast TypedExpr,
29452951
finally_kind: &'ast PipelineAssignmentKind,
29462952
) {
2947-
let expr_range = self.edits.src_span_to_lsp_range(location.to_owned());
2953+
let expr_range = self.edits.src_span_to_lsp_range(*location);
29482954
if !within(self.params.range, expr_range) {
29492955
ast::visit::visit_typed_expr_pipeline(
29502956
self,
@@ -3063,7 +3069,7 @@ impl<'ast> ast::visit::Visit<'ast> for ExtractVariable<'ast> {
30633069
} else {
30643070
self.statement_before_selected_expression = self.latest_statement;
30653071
};
3066-
self.selected_expression = Some((location.to_owned(), expr.type_()));
3072+
self.selected_expression = Some((*location, expr.type_()));
30673073
}
30683074
}
30693075

@@ -3104,7 +3110,7 @@ impl<'ast> ast::visit::Visit<'ast> for ExtractVariable<'ast> {
31043110
location: &'ast SrcSpan,
31053111
statements: &'ast [TypedStatement],
31063112
) {
3107-
let range = self.edits.src_span_to_lsp_range(location.to_owned());
3113+
let range = self.edits.src_span_to_lsp_range(*location);
31083114
if !within(self.params.range, range) {
31093115
ast::visit::visit_typed_expr_block(self, location, statements);
31103116
return;
@@ -6453,7 +6459,7 @@ impl<'ast> ast::visit::Visit<'ast> for WrapInBlock<'ast> {
64536459
) {
64546460
return;
64556461
}
6456-
match *assignment.to_owned().value {
6462+
match assignment.value.as_ref() {
64576463
// To avoid wrapping the same expression in multiple, nested blocks.
64586464
TypedExpr::Block { .. } => {}
64596465
TypedExpr::RecordAccess { .. }

0 commit comments

Comments
 (0)