language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-02 06:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Janitor: Fix clippy::redundant_clone

Browse source
This commit is contained in:
Tobias Hunger 2021-07-22 15:39:16 +02:00
parent f18f333fbb
commit e8aa79e762
10 changed files with 25 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
api/sixtyfps-node/native/lib.rs
View file

@ -111,7 +111,7 @@ fn create<'cx>(
cx: &mut CallContext<'cx, impl neon::object::This>, cx: &mut CallContext<'cx, impl neon::object::This>,
component_type: sixtyfps_interpreter::ComponentDefinition, component_type: sixtyfps_interpreter::ComponentDefinition,
) -> JsResult<'cx, JsValue> { ) -> JsResult<'cx, JsValue> {
let component = component_type.clone().create(); let component = component_type.create();
let persistent_context = persistent_context::PersistentContext::new(cx); let persistent_context = persistent_context::PersistentContext::new(cx);
if let Some(args) = cx.argument_opt(0).and_then(|arg| arg.downcast::<JsObject>().ok()) { if let Some(args) = cx.argument_opt(0).and_then(|arg| arg.downcast::<JsObject>().ok()) {
@ -385,8 +385,7 @@ declare_types! {
.ok_or(()) .ok_or(())
.or_else(|()| { .or_else(|()| {
cx.throw_error(format!("Property {} not found in the component", prop_name)) cx.throw_error(format!("Property {} not found in the component", prop_name))
})? })?;
.clone();
let persistent_context = let persistent_context =
persistent_context::PersistentContext::from_object(&mut cx, this.downcast().unwrap())?; persistent_context::PersistentContext::from_object(&mut cx, this.downcast().unwrap())?;
@ -408,8 +407,7 @@ declare_types! {
.ok_or(()) .ok_or(())
.or_else(|()| { .or_else(|()| {
cx.throw_error(format!("Callback {} not found in the component", callback_name)) cx.throw_error(format!("Callback {} not found in the component", callback_name))
})? })?;
.clone();
let persistent_context = let persistent_context =
persistent_context::PersistentContext::from_object(&mut cx, this.downcast().unwrap())?; persistent_context::PersistentContext::from_object(&mut cx, this.downcast().unwrap())?;
let args = if let Type::Callback {args, ..} = ty { let args = if let Type::Callback {args, ..} = ty {
@ -449,8 +447,7 @@ declare_types! {
.ok_or(()) .ok_or(())
.or_else(|()| { .or_else(|()| {
cx.throw_error(format!("Callback {} not found in the component", callback_name)) cx.throw_error(format!("Callback {} not found in the component", callback_name))
})? })?;
.clone();
if let Type::Callback {return_type, ..} = ty { if let Type::Callback {return_type, ..} = ty {
component.set_callback( component.set_callback(
callback_name.as_str(), callback_name.as_str(),

4
examples/memory/main.rs
View file

@ -51,9 +51,9 @@ pub fn main() {
let is_pair_solved = t1 == t2; let is_pair_solved = t1 == t2;
if is_pair_solved { if is_pair_solved {
t1.solved = true; t1.solved = true;
tiles_model.set_row_data(t1_idx, t1.clone()); tiles_model.set_row_data(t1_idx, t1);
t2.solved = true; t2.solved = true;
tiles_model.set_row_data(t2_idx, t2.clone()); tiles_model.set_row_data(t2_idx, t2);
} else { } else {
main_window_weak.unwrap().set_disable_tiles(true); main_window_weak.unwrap().set_disable_tiles(true);
let main_window_weak = main_window_weak.clone(); let main_window_weak = main_window_weak.clone();

2
examples/slide_puzzle/main.rs
View file

@ -217,7 +217,7 @@ pub fn main() {
state_copy.borrow_mut().randomize(); state_copy.borrow_mut().randomize();
}); });
let state_copy = state.clone(); let state_copy = state;
main_window.on_enable_auto_mode(move |enabled| { main_window.on_enable_auto_mode(move |enabled| {
if enabled { if enabled {
let state_weak = Rc::downgrade(&state_copy); let state_weak = Rc::downgrade(&state_copy);

2
sixtyfps_compiler/passes/collect_globals.rs
View file

@ -26,7 +26,7 @@ pub fn collect_globals(root_component: &Rc<Component>, _diag: &mut BuildDiagnost
let element = nr.element(); let element = nr.element();
let global_component = element.borrow().enclosing_component.upgrade().unwrap(); let global_component = element.borrow().enclosing_component.upgrade().unwrap();
if global_component.is_global() { 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); visit_all_named_references(root_component, &mut maybe_collect_global);

15
sixtyfps_runtime/corelib/input.rs
View file

@ -371,26 +371,23 @@ pub fn process_mouse_input(
let post_visit_state = if mouse_event.pos().map_or(false, |p| geom.contains(p)) let post_visit_state = if mouse_event.pos().map_or(false, |p| geom.contains(p))
|| crate::item_rendering::is_clipping_item(item) || crate::item_rendering::is_clipping_item(item)
{ {
let mut event2 = mouse_event.clone(); let mut event2 = mouse_event;
event2.translate(-geom.origin.to_vector()); event2.translate(-geom.origin.to_vector());
let filter_result = item.as_ref().input_event_filter_before_children( let filter_result =
event2.clone(), item.as_ref().input_event_filter_before_children(event2, window, &item_rc);
window,
&item_rc,
);
mouse_grabber_stack.push((item_rc.downgrade(), filter_result)); mouse_grabber_stack.push((item_rc.downgrade(), filter_result));
match filter_result { match filter_result {
InputEventFilterResult::ForwardAndIgnore => None, InputEventFilterResult::ForwardAndIgnore => None,
InputEventFilterResult::ForwardEvent => { InputEventFilterResult::ForwardEvent => {
Some((event2, mouse_grabber_stack.clone(), item_rc.clone(), false)) Some((event2, mouse_grabber_stack.clone(), item_rc, false))
} }
InputEventFilterResult::ForwardAndInterceptGrab => { InputEventFilterResult::ForwardAndInterceptGrab => {
Some((event2, mouse_grabber_stack.clone(), item_rc.clone(), false)) Some((event2, mouse_grabber_stack.clone(), item_rc, false))
} }
InputEventFilterResult::Intercept => { InputEventFilterResult::Intercept => {
return ( return (
ItemVisitorResult::Abort, ItemVisitorResult::Abort,
Some((event2, mouse_grabber_stack.clone(), item_rc.clone(), true)), Some((event2, mouse_grabber_stack, item_rc, true)),
) )
} }
} }

2
sixtyfps_runtime/interpreter/api.rs
View file

@ -812,7 +812,7 @@ impl ComponentInstance {
pub fn window(&self) -> Rc<sixtyfps_corelib::window::Window> { pub fn window(&self) -> Rc<sixtyfps_corelib::window::Window> {
generativity::make_guard!(guard); generativity::make_guard!(guard);
let comp = self.inner.unerase(guard); let comp = self.inner.unerase(guard);
comp.window().clone() comp.window()
} }
} }

2
sixtyfps_runtime/interpreter/eval.rs
View file

@ -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(); 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 Value::Void
} else { } else {
panic!("internal error: argument to SetFocusItem must be an element") panic!("internal error: argument to SetFocusItem must be an element")

12
sixtyfps_runtime/rendering_backends/gl/eventloop.rs
View file

@ -285,7 +285,7 @@ pub fn run(quit_behavior: sixtyfps_corelib::backend::EventLoopQuitBehavior) {
MouseEvent::MouseReleased { pos: cursor_pos } 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 }, 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); let position = position.to_logical(window.scale_factor() as f64);
cursor_pos = euclid::point2(position.x, position.y); cursor_pos = euclid::point2(position.x, position.y);
window window.process_mouse_input(MouseEvent::MouseMoved { pos: cursor_pos });
.clone()
.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()) windows.borrow().get(&window_id).map(|weakref| weakref.upgrade())
{ {
pressed = false; 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) euclid::point2(d.x, d.y)
} }
}; };
window.clone().process_mouse_input(MouseEvent::MouseWheel { window.process_mouse_input(MouseEvent::MouseWheel {
pos: cursor_pos, pos: cursor_pos,
delta, delta,
}); });

5
sixtyfps_runtime/rendering_backends/qt/widgets.rs
View file

@ -935,7 +935,6 @@ impl Item for NativeGroupBox {
}); });
self.native_padding_bottom.set_binding({ self.native_padding_bottom.set_binding({
let shared_data = shared_data.clone();
move || { move || {
let margins = let margins =
GroupBoxData::FIELD_OFFSETS.paddings.apply_pin(shared_data.as_ref()).get(); 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 _ move || paddings.as_ref().get().top as _
}); });
self.native_padding_bottom.set_binding({ self.native_padding_bottom.set_binding({
let paddings = paddings.clone(); let paddings = paddings;
move || paddings.as_ref().get().bottom as _ move || paddings.as_ref().get().bottom as _
}); });
} }
@ -1242,7 +1241,7 @@ impl Item for NativeScrollView {
move || paddings.as_ref().get().top as _ move || paddings.as_ref().get().top as _
}); });
self.native_padding_bottom.set_binding({ self.native_padding_bottom.set_binding({
let paddings = paddings.clone(); let paddings = paddings;
move || paddings.as_ref().get().bottom as _ move || paddings.as_ref().get().bottom as _
}); });
} }

4
tools/lsp/util.rs
View file

@ -106,7 +106,7 @@ fn lookup_expression_context(mut n: SyntaxNode) -> Option<(syntax_nodes::Element
let prop_name = let prop_name =
sixtyfps_compilerlib::parser::identifier_text(&decl.DeclaredIdentifier())?; sixtyfps_compilerlib::parser::identifier_text(&decl.DeclaredIdentifier())?;
let element = syntax_nodes::Element::new(n.parent()?)?; let element = syntax_nodes::Element::new(n.parent()?)?;
break (element, prop_name.to_string()); break (element, prop_name);
} }
match n.kind() { match n.kind() {
SyntaxKind::Binding SyntaxKind::Binding
@ -115,7 +115,7 @@ fn lookup_expression_context(mut n: SyntaxNode) -> Option<(syntax_nodes::Element
| SyntaxKind::CallbackConnection => { | SyntaxKind::CallbackConnection => {
let prop_name = sixtyfps_compilerlib::parser::identifier_text(&n)?; let prop_name = sixtyfps_compilerlib::parser::identifier_text(&n)?;
let element = syntax_nodes::Element::new(n.parent()?)?; let element = syntax_nodes::Element::new(n.parent()?)?;
break (element, prop_name.to_string()); break (element, prop_name);
} }
SyntaxKind::ConditionalElement | SyntaxKind::RepeatedElement => { SyntaxKind::ConditionalElement | SyntaxKind::RepeatedElement => {
let element = syntax_nodes::Element::new(n.parent()?)?; let element = syntax_nodes::Element::new(n.parent()?)?;