Skip to content

Commit e61334e

Browse files
committed
chore: enable redundant_clone rule
1 parent eff994d commit e61334e

File tree

30 files changed

+63
-86
lines changed

30 files changed

+63
-86
lines changed

crates/rspack/src/builder/mod.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,14 +1001,12 @@ impl CompilerOptionsBuilder {
10011001
filename: (!inline).then_some(output.source_map_filename.as_str().to_string()),
10021002
module_filename_template: output_builder
10031003
.devtool_module_filename_template
1004-
.map(|t| rspack_plugin_devtool::ModuleFilenameTemplate::String(t.as_str().to_string()))
1005-
.clone(),
1004+
.map(|t| rspack_plugin_devtool::ModuleFilenameTemplate::String(t.as_str().to_string())),
10061005
append: hidden.then_some(rspack_plugin_devtool::Append::Disabled),
10071006
columns: !cheap,
10081007
fallback_module_filename_template: output_builder
10091008
.devtool_fallback_module_filename_template
1010-
.map(|t| rspack_plugin_devtool::ModuleFilenameTemplate::String(t.as_str().to_string()))
1011-
.clone(),
1009+
.map(|t| rspack_plugin_devtool::ModuleFilenameTemplate::String(t.as_str().to_string())),
10121010
module: if module_maps { true } else { !cheap },
10131011
namespace: output_builder.devtool_namespace.clone(),
10141012
no_sources,
@@ -1035,8 +1033,7 @@ impl CompilerOptionsBuilder {
10351033
let options = rspack_plugin_devtool::EvalDevToolModulePluginOptions {
10361034
module_filename_template: output_builder
10371035
.devtool_module_filename_template
1038-
.map(|t| rspack_plugin_devtool::ModuleFilenameTemplate::String(t.as_str().to_string()))
1039-
.clone(),
1036+
.map(|t| rspack_plugin_devtool::ModuleFilenameTemplate::String(t.as_str().to_string())),
10401037
namespace: output_builder.devtool_namespace.clone(),
10411038
source_url_comment: None,
10421039
};
@@ -1752,7 +1749,7 @@ impl ModuleOptionsBuilder {
17521749
named_exports: Some(true),
17531750
url: Some(true),
17541751
});
1755-
parser.insert("css".to_string(), css_parser_options.clone());
1752+
parser.insert("css".to_string(), css_parser_options);
17561753

17571754
let css_auto_parser_options = ParserOptions::CssAuto(CssAutoParserOptions {
17581755
named_exports: Some(true),

crates/rspack_browser/src/oneshot.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
2424
inner: inner.clone(),
2525
};
2626

27-
let rx = Receiver {
28-
inner: inner.clone(),
29-
};
27+
let rx = Receiver { inner };
3028

3129
(tx, rx)
3230
}

crates/rspack_core/src/chunk_graph/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ impl ChunkGraph {
101101
.map(|chunk_name| format!(" <tr><td>{chunk_name}</td></tr>"))
102102
.join("\n");
103103

104-
let table_body = requests.clone();
104+
let table_body = requests;
105105

106106
format!(
107107
r#"

crates/rspack_core/src/compilation/build_module_graph/module_executor/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl ModuleExecutor {
7171
};
7272
let (event_sender, event_receiver) = unbounded_channel();
7373
let (stop_sender, stop_receiver) = oneshot::channel();
74-
self.event_sender = Some(event_sender.clone());
74+
self.event_sender = Some(event_sender);
7575
self.stop_receiver = Some(stop_receiver);
7676
// avoid coop budget consumed to zero cause hang risk
7777
// related to https://tokio.rs/blog/2020-04-preemption

crates/rspack_core/src/concatenated_module.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2447,7 +2447,7 @@ impl ConcatenatedModule {
24472447
module_graph,
24482448
module_graph_cache,
24492449
info,
2450-
export_name.clone(),
2450+
export_name,
24512451
module_to_info_map,
24522452
runtime,
24532453
as_call,
@@ -2939,7 +2939,7 @@ impl ConcatenatedModule {
29392939
mg_cache,
29402940
&ref_info.id(),
29412941
if let Some(reexport_export) = reexport.export {
2942-
[reexport_export.clone(), export_name[1..].to_vec()].concat()
2942+
[reexport_export, export_name[1..].to_vec()].concat()
29432943
} else {
29442944
export_name[1..].to_vec()
29452945
},

crates/rspack_core/src/external_module.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,15 +567,15 @@ impl ExternalModule {
567567

568568
concatenation_scope.register_namespace_import(
569569
request.primary().to_string(),
570-
attributes.clone(),
570+
attributes,
571571
format!("__rspack_external_{id}").into(),
572572
);
573573
concatenation_scope.register_namespace_export(&namespace_export_with_name);
574574
}
575575
UsedExports::UsedNamespace(false) => {
576576
concatenation_scope.register_import(
577577
request.primary().to_string(),
578-
attributes.clone(),
578+
attributes,
579579
None,
580580
);
581581
}
@@ -587,7 +587,7 @@ impl ExternalModule {
587587
"import * as __rspack_external_{} from {}{};\n",
588588
id.clone(),
589589
json_stringify(request.primary()),
590-
attributes.clone().unwrap_or_default()
590+
attributes.unwrap_or_default()
591591
),
592592
InitFragmentStage::StageESMImports,
593593
module_graph

crates/rspack_loader_swc/src/rsc_transforms/server_actions.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ impl<'a, C: Comments> ServerActions<'a, C> {
394394
}
395395

396396
let action_name = self.gen_action_ident();
397-
let action_ident = Ident::new(action_name.clone(), arrow.span, self.private_ctxt);
397+
let action_ident = Ident::new(action_name, arrow.span, self.private_ctxt);
398398
let action_id = self.generate_server_reference_id(
399399
&ModuleExportName::Ident(action_ident.clone()),
400400
Some(&new_params),
@@ -524,17 +524,17 @@ impl<'a, C: Comments> ServerActions<'a, C> {
524524
})));
525525

526526
if ids_from_closure.is_empty() {
527-
Expr::Ident(action_ident.clone())
527+
Expr::Ident(action_ident)
528528
} else {
529529
self.has_server_reference_with_bound_args = true;
530530
bind_args_to_ident(
531-
action_ident.clone(),
531+
action_ident,
532532
ids_from_closure
533533
.iter()
534534
.cloned()
535535
.map(|id| Some(id.as_arg()))
536536
.collect(),
537-
action_id.clone(),
537+
action_id,
538538
)
539539
}
540540
}
@@ -559,7 +559,7 @@ impl<'a, C: Comments> ServerActions<'a, C> {
559559
new_params.append(&mut function.params);
560560

561561
let action_name: Atom = self.gen_action_ident();
562-
let mut action_ident = Ident::new(action_name.clone(), function.span, self.private_ctxt);
562+
let mut action_ident = Ident::new(action_name, function.span, self.private_ctxt);
563563
if action_ident.span.lo == self.start_pos {
564564
action_ident.span = Span::dummy_with_cmt();
565565
}
@@ -668,17 +668,17 @@ impl<'a, C: Comments> ServerActions<'a, C> {
668668
})));
669669

670670
if ids_from_closure.is_empty() {
671-
Expr::Ident(action_ident.clone())
671+
Expr::Ident(action_ident)
672672
} else {
673673
self.has_server_reference_with_bound_args = true;
674674
bind_args_to_ident(
675-
action_ident.clone(),
675+
action_ident,
676676
ids_from_closure
677677
.iter()
678678
.cloned()
679679
.map(|id| Some(id.as_arg()))
680680
.collect(),
681-
action_id.clone(),
681+
action_id,
682682
)
683683
}
684684
}
@@ -716,7 +716,7 @@ impl<'a, C: Comments> ServerActions<'a, C> {
716716
self.server_reference_exports.push(ServerReferenceExport {
717717
ident: fn_name.clone(),
718718
export_name: export_name.clone(),
719-
reference_id: reference_id.clone(),
719+
reference_id,
720720
});
721721
} else if self.is_default_export() {
722722
let action_ident = Ident::new(self.gen_action_ident(), span, self.private_ctxt);
@@ -730,7 +730,7 @@ impl<'a, C: Comments> ServerActions<'a, C> {
730730
self.server_reference_exports.push(ServerReferenceExport {
731731
ident: action_ident.clone(),
732732
export_name: export_name.clone(),
733-
reference_id: reference_id.clone(),
733+
reference_id,
734734
});
735735

736736
// For the server layer, also hoist the function and rewrite the default export.
@@ -825,8 +825,8 @@ impl<'a, C: Comments> VisitMut for ServerActions<'a, C> {
825825

826826
self.server_reference_exports.push(ServerReferenceExport {
827827
ident: action_ident.clone(),
828-
export_name: export_name.clone(),
829-
reference_id: action_id.clone(),
828+
export_name,
829+
reference_id: action_id,
830830
});
831831

832832
self
@@ -1146,7 +1146,7 @@ impl<'a, C: Comments> VisitMut for ServerActions<'a, C> {
11461146
self.rewrite_expr_to_proxy_expr = None;
11471147
self.current_export_name = None;
11481148
n.visit_mut_children_with(self);
1149-
self.current_export_name = old_current_export_name.clone();
1149+
self.current_export_name = old_current_export_name;
11501150
self.this_status = old_this_status;
11511151

11521152
if let Some(expr) = self.rewrite_expr_to_proxy_expr.take() {
@@ -2072,7 +2072,7 @@ fn annotate_ident_as_server_reference(ident: Ident, action_id: Atom, original_sp
20722072
},
20732073
ExprOrSpread {
20742074
spread: None,
2075-
expr: Box::new(action_id.clone().into()),
2075+
expr: Box::new(action_id.into()),
20762076
},
20772077
ExprOrSpread {
20782078
spread: None,

crates/rspack_macros_test/tests/merge.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod enum_fields {
3030
two: "2".to_string(),
3131
three: "3".to_string(),
3232
};
33-
let t5 = MergeFrom::merge_from(t1.clone(), &t4);
33+
let t5 = MergeFrom::merge_from(t1, &t4);
3434
assert!(matches!(t5, Test::A { one, two, three } if one == "1" && two == "2" && three == "3"));
3535
}
3636
}
@@ -58,7 +58,7 @@ mod enum_base {
5858
three: "three".to_string(),
5959
};
6060
let t2 = Test::C;
61-
let t3 = MergeFrom::merge_from(t1.clone(), &t2);
61+
let t3 = MergeFrom::merge_from(t1, &t2);
6262
assert!(
6363
matches!(t3, Test::A { one, two, three } if one == "one" && two == "two" && three == "three")
6464
);

crates/rspack_plugin_asset/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ impl Plugin for AssetPlugin {
911911
.and_then(|x| x.emit);
912912

913913
Box::new(AssetParserAndGenerator::with_auto(
914-
data_url_condition.clone(),
914+
data_url_condition,
915915
emit.unwrap_or(true),
916916
))
917917
}),

crates/rspack_plugin_copy/src/lib.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,7 @@ impl CopyRspackPlugin {
205205
}
206206
};
207207

208-
to.clone()
209-
.as_path()
210-
.normalize()
211-
.to_string_lossy()
212-
.to_string()
208+
to.as_path().normalize().to_string_lossy().to_string()
213209
} else {
214210
String::new()
215211
};

0 commit comments

Comments
 (0)