From e8aa79e762695b7b88c97b25d0dae5060f160a58 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 22 Jul 2021 15:39:16 +0200 Subject: [PATCH] Janitor: Fix clippy::redundant_clone --- api/sixtyfps-node/native/lib.rs | 11 ++++------- examples/memory/main.rs | 4 ++-- examples/slide_puzzle/main.rs | 2 +- sixtyfps_compiler/passes/collect_globals.rs | 2 +- sixtyfps_runtime/corelib/input.rs | 15 ++++++--------- sixtyfps_runtime/interpreter/api.rs | 2 +- sixtyfps_runtime/interpreter/eval.rs | 2 +- .../rendering_backends/gl/eventloop.rs | 12 +++++------- sixtyfps_runtime/rendering_backends/qt/widgets.rs | 5 ++--- tools/lsp/util.rs | 4 ++-- 10 files changed, 25 insertions(+), 34 deletions(-) diff --git a/api/sixtyfps-node/native/lib.rs b/api/sixtyfps-node/native/lib.rs index 845dfece2..346696c90 100644 --- a/api/sixtyfps-node/native/lib.rs +++ b/api/sixtyfps-node/native/lib.rs @@ -111,7 +111,7 @@ fn create<'cx>( cx: &mut CallContext<'cx, impl neon::object::This>, component_type: sixtyfps_interpreter::ComponentDefinition, ) -> JsResult<'cx, JsValue> { - let component = component_type.clone().create(); + let component = component_type.create(); let persistent_context = persistent_context::PersistentContext::new(cx); if let Some(args) = cx.argument_opt(0).and_then(|arg| arg.downcast::().ok()) { @@ -385,8 +385,7 @@ declare_types! { .ok_or(()) .or_else(|()| { cx.throw_error(format!("Property {} not found in the component", prop_name)) - })? - .clone(); + })?; let persistent_context = persistent_context::PersistentContext::from_object(&mut cx, this.downcast().unwrap())?; @@ -408,8 +407,7 @@ declare_types! { .ok_or(()) .or_else(|()| { cx.throw_error(format!("Callback {} not found in the component", callback_name)) - })? - .clone(); + })?; let persistent_context = persistent_context::PersistentContext::from_object(&mut cx, this.downcast().unwrap())?; let args = if let Type::Callback {args, ..} = ty { @@ -449,8 +447,7 @@ declare_types! { .ok_or(()) .or_else(|()| { cx.throw_error(format!("Callback {} not found in the component", callback_name)) - })? - .clone(); + })?; if let Type::Callback {return_type, ..} = ty { component.set_callback( callback_name.as_str(), diff --git a/examples/memory/main.rs b/examples/memory/main.rs index 623498308..9a6361a71 100644 --- a/examples/memory/main.rs +++ b/examples/memory/main.rs @@ -51,9 +51,9 @@ pub fn main() { let is_pair_solved = t1 == t2; if is_pair_solved { t1.solved = true; - tiles_model.set_row_data(t1_idx, t1.clone()); + tiles_model.set_row_data(t1_idx, t1); t2.solved = true; - tiles_model.set_row_data(t2_idx, t2.clone()); + tiles_model.set_row_data(t2_idx, t2); } else { main_window_weak.unwrap().set_disable_tiles(true); let main_window_weak = main_window_weak.clone(); diff --git a/examples/slide_puzzle/main.rs b/examples/slide_puzzle/main.rs index ecd734c0f..7305a1857 100644 --- a/examples/slide_puzzle/main.rs +++ b/examples/slide_puzzle/main.rs @@ -217,7 +217,7 @@ pub fn main() { state_copy.borrow_mut().randomize(); }); - let state_copy = state.clone(); + let state_copy = state; main_window.on_enable_auto_mode(move |enabled| { if enabled { let state_weak = Rc::downgrade(&state_copy); diff --git a/sixtyfps_compiler/passes/collect_globals.rs b/sixtyfps_compiler/passes/collect_globals.rs index 9282f616a..6266eae22 100644 --- a/sixtyfps_compiler/passes/collect_globals.rs +++ b/sixtyfps_compiler/passes/collect_globals.rs @@ -26,7 +26,7 @@ pub fn collect_globals(root_component: &Rc, _diag: &mut BuildDiagnost let element = nr.element(); let global_component = element.borrow().enclosing_component.upgrade().unwrap(); if global_component.is_global() { - set.insert(ByAddress(global_component.clone())); + set.insert(ByAddress(global_component)); } }; visit_all_named_references(root_component, &mut maybe_collect_global); diff --git a/sixtyfps_runtime/corelib/input.rs b/sixtyfps_runtime/corelib/input.rs index 09b935a2e..ee5833119 100644 --- a/sixtyfps_runtime/corelib/input.rs +++ b/sixtyfps_runtime/corelib/input.rs @@ -371,26 +371,23 @@ pub fn process_mouse_input( let post_visit_state = if mouse_event.pos().map_or(false, |p| geom.contains(p)) || crate::item_rendering::is_clipping_item(item) { - let mut event2 = mouse_event.clone(); + let mut event2 = mouse_event; event2.translate(-geom.origin.to_vector()); - let filter_result = item.as_ref().input_event_filter_before_children( - event2.clone(), - window, - &item_rc, - ); + let filter_result = + item.as_ref().input_event_filter_before_children(event2, window, &item_rc); mouse_grabber_stack.push((item_rc.downgrade(), filter_result)); match filter_result { InputEventFilterResult::ForwardAndIgnore => None, InputEventFilterResult::ForwardEvent => { - Some((event2, mouse_grabber_stack.clone(), item_rc.clone(), false)) + Some((event2, mouse_grabber_stack.clone(), item_rc, false)) } InputEventFilterResult::ForwardAndInterceptGrab => { - Some((event2, mouse_grabber_stack.clone(), item_rc.clone(), false)) + Some((event2, mouse_grabber_stack.clone(), item_rc, false)) } InputEventFilterResult::Intercept => { return ( ItemVisitorResult::Abort, - Some((event2, mouse_grabber_stack.clone(), item_rc.clone(), true)), + Some((event2, mouse_grabber_stack, item_rc, true)), ) } } diff --git a/sixtyfps_runtime/interpreter/api.rs b/sixtyfps_runtime/interpreter/api.rs index 97be94ca7..616e23383 100644 --- a/sixtyfps_runtime/interpreter/api.rs +++ b/sixtyfps_runtime/interpreter/api.rs @@ -812,7 +812,7 @@ impl ComponentInstance { pub fn window(&self) -> Rc { generativity::make_guard!(guard); let comp = self.inner.unerase(guard); - comp.window().clone() + comp.window() } } diff --git a/sixtyfps_runtime/interpreter/eval.rs b/sixtyfps_runtime/interpreter/eval.rs index d6a240c82..2ff867116 100644 --- a/sixtyfps_runtime/interpreter/eval.rs +++ b/sixtyfps_runtime/interpreter/eval.rs @@ -275,7 +275,7 @@ pub fn eval_expression(expression: &Expression, local_context: &mut EvalLocalCon let focus_item_comp = enclosing_component.self_weak().get().unwrap().upgrade().unwrap(); - window_ref(component).unwrap().clone().set_focus_item(&corelib::items::ItemRc::new(vtable::VRc::into_dyn(focus_item_comp), item_info.item_index())); + window_ref(component).unwrap().set_focus_item(&corelib::items::ItemRc::new(vtable::VRc::into_dyn(focus_item_comp), item_info.item_index())); Value::Void } else { panic!("internal error: argument to SetFocusItem must be an element") diff --git a/sixtyfps_runtime/rendering_backends/gl/eventloop.rs b/sixtyfps_runtime/rendering_backends/gl/eventloop.rs index 805aa4cdd..0427820a4 100644 --- a/sixtyfps_runtime/rendering_backends/gl/eventloop.rs +++ b/sixtyfps_runtime/rendering_backends/gl/eventloop.rs @@ -285,7 +285,7 @@ pub fn run(quit_behavior: sixtyfps_corelib::backend::EventLoopQuitBehavior) { MouseEvent::MouseReleased { pos: cursor_pos } } }; - window.clone().process_mouse_input(ev); + window.process_mouse_input(ev); } }); } @@ -313,7 +313,7 @@ pub fn run(quit_behavior: sixtyfps_corelib::backend::EventLoopQuitBehavior) { } winit::event::TouchPhase::Moved => MouseEvent::MouseMoved { pos }, }; - window.clone().process_mouse_input(ev); + window.process_mouse_input(ev); } }); } @@ -329,9 +329,7 @@ pub fn run(quit_behavior: sixtyfps_corelib::backend::EventLoopQuitBehavior) { { let position = position.to_logical(window.scale_factor() as f64); cursor_pos = euclid::point2(position.x, position.y); - window - .clone() - .process_mouse_input(MouseEvent::MouseMoved { pos: cursor_pos }); + window.process_mouse_input(MouseEvent::MouseMoved { pos: cursor_pos }); } }); } @@ -349,7 +347,7 @@ pub fn run(quit_behavior: sixtyfps_corelib::backend::EventLoopQuitBehavior) { windows.borrow().get(&window_id).map(|weakref| weakref.upgrade()) { pressed = false; - window.clone().process_mouse_input(MouseEvent::MouseExit); + window.process_mouse_input(MouseEvent::MouseExit); } }); } @@ -373,7 +371,7 @@ pub fn run(quit_behavior: sixtyfps_corelib::backend::EventLoopQuitBehavior) { euclid::point2(d.x, d.y) } }; - window.clone().process_mouse_input(MouseEvent::MouseWheel { + window.process_mouse_input(MouseEvent::MouseWheel { pos: cursor_pos, delta, }); diff --git a/sixtyfps_runtime/rendering_backends/qt/widgets.rs b/sixtyfps_runtime/rendering_backends/qt/widgets.rs index 009ce24e5..041a77aad 100644 --- a/sixtyfps_runtime/rendering_backends/qt/widgets.rs +++ b/sixtyfps_runtime/rendering_backends/qt/widgets.rs @@ -935,7 +935,6 @@ impl Item for NativeGroupBox { }); self.native_padding_bottom.set_binding({ - let shared_data = shared_data.clone(); move || { let margins = GroupBoxData::FIELD_OFFSETS.paddings.apply_pin(shared_data.as_ref()).get(); @@ -1086,7 +1085,7 @@ impl Item for NativeLineEdit { move || paddings.as_ref().get().top as _ }); self.native_padding_bottom.set_binding({ - let paddings = paddings.clone(); + let paddings = paddings; move || paddings.as_ref().get().bottom as _ }); } @@ -1242,7 +1241,7 @@ impl Item for NativeScrollView { move || paddings.as_ref().get().top as _ }); self.native_padding_bottom.set_binding({ - let paddings = paddings.clone(); + let paddings = paddings; move || paddings.as_ref().get().bottom as _ }); } diff --git a/tools/lsp/util.rs b/tools/lsp/util.rs index bb627a9e2..36b89eb93 100644 --- a/tools/lsp/util.rs +++ b/tools/lsp/util.rs @@ -106,7 +106,7 @@ fn lookup_expression_context(mut n: SyntaxNode) -> Option<(syntax_nodes::Element let prop_name = sixtyfps_compilerlib::parser::identifier_text(&decl.DeclaredIdentifier())?; let element = syntax_nodes::Element::new(n.parent()?)?; - break (element, prop_name.to_string()); + break (element, prop_name); } match n.kind() { SyntaxKind::Binding @@ -115,7 +115,7 @@ fn lookup_expression_context(mut n: SyntaxNode) -> Option<(syntax_nodes::Element | SyntaxKind::CallbackConnection => { let prop_name = sixtyfps_compilerlib::parser::identifier_text(&n)?; let element = syntax_nodes::Element::new(n.parent()?)?; - break (element, prop_name.to_string()); + break (element, prop_name); } SyntaxKind::ConditionalElement | SyntaxKind::RepeatedElement => { let element = syntax_nodes::Element::new(n.parent()?)?;