From 7e24fb3c58d38fe82269355d59379ea24e5a5813 Mon Sep 17 00:00:00 2001 From: Muhammad Hamza Date: Sun, 25 Sep 2022 17:25:23 +0500 Subject: [PATCH] Clippy fixes (#2881) * Clippy in root * Clippy in examples * didn't mean to commit this file --- examples/boids/src/slider.rs | 2 +- .../src/components/chessboard_card.rs | 2 +- packages/yew-macro/src/function_component.rs | 2 +- packages/yew-macro/src/hook/body.rs | 8 ++++---- packages/yew/src/dom_bundle/btag/attributes.rs | 2 +- packages/yew/src/dom_bundle/btag/listeners.rs | 2 +- packages/yew/src/dom_bundle/subtree_root.rs | 2 +- packages/yew/src/functional/hooks/use_reducer.rs | 2 +- packages/yew/src/functional/mod.rs | 2 +- packages/yew/src/html/component/lifecycle.rs | 2 +- packages/yew/src/html/component/mod.rs | 2 +- packages/yew/src/scheduler.rs | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/boids/src/slider.rs b/examples/boids/src/slider.rs index f9f09bb76..4c0edfabb 100644 --- a/examples/boids/src/slider.rs +++ b/examples/boids/src/slider.rs @@ -56,7 +56,7 @@ impl Component for Slider { step, } = *ctx.props(); - let precision = precision.unwrap_or(if percentage { 1 } else { 0 }); + let precision = precision.unwrap_or_else(|| usize::from(percentage)); let display_value = if percentage { format!("{:.p$}%", 100.0 * value, p = precision) diff --git a/examples/function_memory_game/src/components/chessboard_card.rs b/examples/function_memory_game/src/components/chessboard_card.rs index a3c2ce43b..77ed6c62e 100644 --- a/examples/function_memory_game/src/components/chessboard_card.rs +++ b/examples/function_memory_game/src/components/chessboard_card.rs @@ -42,7 +42,7 @@ pub fn ChessboardCard(props: &Props) -> Html { html! {
-
+
card card
diff --git a/packages/yew-macro/src/function_component.rs b/packages/yew-macro/src/function_component.rs index af30bb9ad..9e6a1df49 100644 --- a/packages/yew-macro/src/function_component.rs +++ b/packages/yew-macro/src/function_component.rs @@ -102,7 +102,7 @@ impl Parse for FunctionComponent { if ty.mutability.is_some() { return Err(syn::Error::new_spanned( - &ty.mutability, + ty.mutability, "reference must not be mutable", )); } diff --git a/packages/yew-macro/src/hook/body.rs b/packages/yew-macro/src/hook/body.rs index 4bdba7bfc..b0f64ae7f 100644 --- a/packages/yew-macro/src/hook/body.rs +++ b/packages/yew-macro/src/hook/body.rs @@ -98,12 +98,12 @@ impl VisitMut for BodyRewriter { visit_mut::visit_attribute_mut(self, it); } - visit_mut::visit_expr_mut(self, &mut *i.cond); + visit_mut::visit_expr_mut(self, &mut i.cond); self.with_branch(|m| visit_mut::visit_block_mut(m, &mut i.then_branch)); if let Some(it) = &mut i.else_branch { - self.with_branch(|m| visit_mut::visit_expr_mut(m, &mut *(it).1)); + self.with_branch(|m| visit_mut::visit_expr_mut(m, &mut (it).1)); } } @@ -119,7 +119,7 @@ impl VisitMut for BodyRewriter { visit_mut::visit_label_mut(self, it); } visit_mut::visit_pat_mut(self, &mut i.pat); - visit_mut::visit_expr_mut(self, &mut *i.expr); + visit_mut::visit_expr_mut(self, &mut i.expr); self.with_branch(|m| visit_mut::visit_block_mut(m, &mut i.body)); } @@ -129,7 +129,7 @@ impl VisitMut for BodyRewriter { visit_mut::visit_attribute_mut(self, it); } - visit_mut::visit_expr_mut(self, &mut *i.expr); + visit_mut::visit_expr_mut(self, &mut i.expr); self.with_branch(|m| { for it in &mut i.arms { diff --git a/packages/yew/src/dom_bundle/btag/attributes.rs b/packages/yew/src/dom_bundle/btag/attributes.rs index 040905ba7..7cfa0a522 100644 --- a/packages/yew/src/dom_bundle/btag/attributes.rs +++ b/packages/yew/src/dom_bundle/btag/attributes.rs @@ -192,7 +192,7 @@ impl Apply for Attributes { match &self { Self::Static(arr) => { for (k, v, apply_as) in arr.iter() { - Self::set(el, *k, *v, *apply_as); + Self::set(el, k, v, *apply_as); } } Self::Dynamic { keys, values } => { diff --git a/packages/yew/src/dom_bundle/btag/listeners.rs b/packages/yew/src/dom_bundle/btag/listeners.rs index df328cfb7..746e23eb7 100644 --- a/packages/yew/src/dom_bundle/btag/listeners.rs +++ b/packages/yew/src/dom_bundle/btag/listeners.rs @@ -66,7 +66,7 @@ impl Apply for Listeners { (Pending(pending), Registered(ref id)) => { // Reuse the ID test_log!("reusing listeners for {}", id); - root.with_listener_registry(|reg| reg.patch(root, id, &*pending)); + root.with_listener_registry(|reg| reg.patch(root, id, &pending)); } (Pending(pending), bundle @ NoReg) => { *bundle = ListenerRegistration::register(root, el, &pending); diff --git a/packages/yew/src/dom_bundle/subtree_root.rs b/packages/yew/src/dom_bundle/subtree_root.rs index 1d86e8e01..fdf385196 100644 --- a/packages/yew/src/dom_bundle/subtree_root.rs +++ b/packages/yew/src/dom_bundle/subtree_root.rs @@ -484,7 +484,7 @@ impl BSubtree { /// Run f with access to global Registry #[inline] pub fn with_listener_registry(&self, f: impl FnOnce(&mut Registry) -> R) -> R { - f(&mut *self.0.event_registry().borrow_mut()) + f(&mut self.0.event_registry().borrow_mut()) } pub fn brand_element(&self, el: &dyn EventGrating) { diff --git a/packages/yew/src/functional/hooks/use_reducer.rs b/packages/yew/src/functional/hooks/use_reducer.rs index 15ae1af68..08700f0ee 100644 --- a/packages/yew/src/functional/hooks/use_reducer.rs +++ b/packages/yew/src/functional/hooks/use_reducer.rs @@ -59,7 +59,7 @@ where type Target = T; fn deref(&self) -> &Self::Target { - &*self.value + &self.value } } diff --git a/packages/yew/src/functional/mod.rs b/packages/yew/src/functional/mod.rs index 01133b5cb..1f3ce0131 100644 --- a/packages/yew/src/functional/mod.rs +++ b/packages/yew/src/functional/mod.rs @@ -356,7 +356,7 @@ where hook_ctx.prepare_run(); #[allow(clippy::let_and_return)] - let result = T::run(&mut *hook_ctx, props); + let result = T::run(&mut hook_ctx, props); #[cfg(debug_assertions)] hook_ctx.assert_hook_context(result.is_ok()); diff --git a/packages/yew/src/html/component/lifecycle.rs b/packages/yew/src/html/component/lifecycle.rs index fca8ee27b..a94813bd2 100644 --- a/packages/yew/src/html/component/lifecycle.rs +++ b/packages/yew/src/html/component/lifecycle.rs @@ -206,7 +206,7 @@ where if self.context.props != props { let old_props = std::mem::replace(&mut self.context.props, props); - self.component.changed(&self.context, &*old_props) + self.component.changed(&self.context, &old_props) } else { false } diff --git a/packages/yew/src/html/component/mod.rs b/packages/yew/src/html/component/mod.rs index f3fd7f9a9..5640cf6d9 100644 --- a/packages/yew/src/html/component/mod.rs +++ b/packages/yew/src/html/component/mod.rs @@ -50,7 +50,7 @@ impl Context { /// The component's props #[inline] pub fn props(&self) -> &COMP::Properties { - &*self.props + &self.props } #[cfg(feature = "hydration")] diff --git a/packages/yew/src/scheduler.rs b/packages/yew/src/scheduler.rs index 63656bdfc..f3dcdcc3d 100644 --- a/packages/yew/src/scheduler.rs +++ b/packages/yew/src/scheduler.rs @@ -96,7 +96,7 @@ fn with(f: impl FnOnce(&mut Scheduler) -> R) -> R { static SCHEDULER: RefCell = Default::default(); } - SCHEDULER.with(|s| f(&mut *s.borrow_mut())) + SCHEDULER.with(|s| f(&mut s.borrow_mut())) } /// Push a generic [Runnable] to be executed