From 4a7fe938ade48dad510b547be079321c89ce728b Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Sun, 4 Feb 2024 23:03:52 -0800 Subject: [PATCH] Make clippy happy --- packages/core/tests/create_fragments.rs | 2 +- packages/core/tests/fuzzing.rs | 1 - packages/core/tests/task.rs | 6 +++--- packages/dioxus/benches/jsframework.rs | 2 +- packages/hooks/src/use_effect.rs | 2 +- packages/hooks/src/use_future.rs | 4 ++-- packages/hooks/src/use_memo.rs | 2 +- packages/hooks/src/use_resource.rs | 2 +- packages/hooks/src/use_signal.rs | 15 +++++++-------- packages/ssr/src/renderer.rs | 6 +++--- packages/ssr/tests/bool_attr.rs | 4 ++-- packages/ssr/tests/hydration.rs | 22 +++++++++++----------- packages/ssr/tests/inner_html.rs | 4 ++-- packages/ssr/tests/simple.rs | 2 +- packages/ssr/tests/styles.rs | 2 +- packages/web/examples/hydrate.rs | 2 +- packages/web/tests/hydrate.rs | 2 +- 17 files changed, 39 insertions(+), 41 deletions(-) diff --git a/packages/core/tests/create_fragments.rs b/packages/core/tests/create_fragments.rs index 930067e66..c39ab2e86 100644 --- a/packages/core/tests/create_fragments.rs +++ b/packages/core/tests/create_fragments.rs @@ -7,7 +7,7 @@ use dioxus_core::ElementId; #[test] fn empty_fragment_creates_nothing() { fn app() -> Element { - rsx!({ () }) + rsx!({}) } let mut vdom = VirtualDom::new(app); diff --git a/packages/core/tests/fuzzing.rs b/packages/core/tests/fuzzing.rs index 739494f9b..6ee1e9f51 100644 --- a/packages/core/tests/fuzzing.rs +++ b/packages/core/tests/fuzzing.rs @@ -218,7 +218,6 @@ fn create_random_dynamic_attr() -> Attribute { random_ns(), rand::random(), ) - .into() } static mut TEMPLATE_COUNT: usize = 0; diff --git a/packages/core/tests/task.rs b/packages/core/tests/task.rs index cab63eabd..8bc120010 100644 --- a/packages/core/tests/task.rs +++ b/packages/core/tests/task.rs @@ -36,7 +36,7 @@ async fn it_works() { }); }); - rsx!({ () }) + rsx!({}) } run_vdom(app).await; @@ -76,7 +76,7 @@ async fn yield_now_works() { }) }); - rsx!({ () }) + rsx!({}) } run_vdom(app).await; @@ -110,7 +110,7 @@ async fn flushing() { }) }); - rsx!({ () }) + rsx!({}) } let mut dom = VirtualDom::new(app); diff --git a/packages/dioxus/benches/jsframework.rs b/packages/dioxus/benches/jsframework.rs index c7010ffe1..7c8651155 100644 --- a/packages/dioxus/benches/jsframework.rs +++ b/packages/dioxus/benches/jsframework.rs @@ -28,7 +28,7 @@ criterion_main!(mbenches); fn create_rows(c: &mut Criterion) { c.bench_function("create rows", |b| { let mut dom = VirtualDom::new(app); - let _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); b.iter(|| { dom.rebuild(&mut NoOpMutations); diff --git a/packages/hooks/src/use_effect.rs b/packages/hooks/src/use_effect.rs index 304a5fe90..0e2ce36c0 100644 --- a/packages/hooks/src/use_effect.rs +++ b/packages/hooks/src/use_effect.rs @@ -18,7 +18,7 @@ pub fn use_effect(mut callback: impl FnMut() + 'static) { flush_sync().await; // Run the effect - rc.run_in(|| callback()); + rc.run_in(&mut callback); // Wait for context to change rc.changed().await; diff --git a/packages/hooks/src/use_future.rs b/packages/hooks/src/use_future.rs index ff6ae35f9..4d69879aa 100644 --- a/packages/hooks/src/use_future.rs +++ b/packages/hooks/src/use_future.rs @@ -117,13 +117,13 @@ impl UseFuture { /// Reading this does not subscribe to the future's state pub fn finished(&self) -> bool { matches!( - self.state.peek().clone(), + *self.state.peek(), UseFutureState::Ready | UseFutureState::Stopped ) } /// Get the current state of the future. pub fn state(&self) -> ReadOnlySignal { - self.state.clone().into() + self.state.into() } } diff --git a/packages/hooks/src/use_memo.rs b/packages/hooks/src/use_memo.rs index 37b110b36..0d6d2e8e2 100644 --- a/packages/hooks/src/use_memo.rs +++ b/packages/hooks/src/use_memo.rs @@ -59,7 +59,7 @@ pub fn use_maybe_sync_memo>>( // Wait for the dom the be finished with sync work flush_sync().await; rc.changed().await; - let new = rc.run_in(|| f()); + let new = rc.run_in(&mut f); if new != *state.peek() { *state.write() = new; } diff --git a/packages/hooks/src/use_resource.rs b/packages/hooks/src/use_resource.rs index d7c84f28c..2124a7289 100644 --- a/packages/hooks/src/use_resource.rs +++ b/packages/hooks/src/use_resource.rs @@ -149,7 +149,7 @@ impl Resource { /// Get the current value of the future. pub fn value(&self) -> Option> { - self.value.peek().as_ref().map(|sig| sig.clone().into()) + self.value.peek().as_ref().map(|sig| (*sig).into()) } /// Wait for this async memo to resolve, returning the inner signal value diff --git a/packages/hooks/src/use_signal.rs b/packages/hooks/src/use_signal.rs index ce6087ea2..5ae93897c 100644 --- a/packages/hooks/src/use_signal.rs +++ b/packages/hooks/src/use_signal.rs @@ -86,17 +86,16 @@ fn use_maybe_signal_sync>>( #[cfg(debug_assertions)] let caller = std::panic::Location::caller(); - let signal = use_hook(|| { + // todo: (jon) + // By default, we want to unsubscribe the current component from the signal on every render + // any calls to .read() in the body will re-subscribe the component to the signal + // use_before_render(move || signal.unsubscribe(current_scope_id().unwrap())); + + use_hook(|| { Signal::new_with_caller( f(), #[cfg(debug_assertions)] caller, ) - }); - - // By default, we want to unsubscribe the current component from the signal on every render - // any calls to .read() in the body will re-subscribe the component to the signal - // use_before_render(move || signal.unsubscribe(current_scope_id().unwrap())); - - signal + }) } diff --git a/packages/ssr/src/renderer.rs b/packages/ssr/src/renderer.rs index 5767ad489..aca74570c 100644 --- a/packages/ssr/src/renderer.rs +++ b/packages/ssr/src/renderer.rs @@ -249,7 +249,7 @@ fn to_string_works() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); let mut renderer = Renderer::new(); let out = renderer.render(&dom); @@ -299,7 +299,7 @@ fn empty_for_loop_works() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); let mut renderer = Renderer::new(); let out = renderer.render(&dom); @@ -336,7 +336,7 @@ fn empty_render_works() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); let mut renderer = Renderer::new(); let out = renderer.render(&dom); diff --git a/packages/ssr/tests/bool_attr.rs b/packages/ssr/tests/bool_attr.rs index 40441b5a7..b04f787e8 100644 --- a/packages/ssr/tests/bool_attr.rs +++ b/packages/ssr/tests/bool_attr.rs @@ -10,7 +10,7 @@ fn static_boolean_attributs() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::render(&dom), @@ -28,7 +28,7 @@ fn dynamic_boolean_attributs() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::render(&dom), diff --git a/packages/ssr/tests/hydration.rs b/packages/ssr/tests/hydration.rs index 7c6868def..50c04a0ba 100644 --- a/packages/ssr/tests/hydration.rs +++ b/packages/ssr/tests/hydration.rs @@ -7,7 +7,7 @@ fn root_ids() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -25,7 +25,7 @@ fn dynamic_attributes() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -42,7 +42,7 @@ fn listeners() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -57,7 +57,7 @@ fn listeners() { } let mut dom = VirtualDom::new(app2); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -75,7 +75,7 @@ fn text_nodes() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -90,7 +90,7 @@ fn text_nodes() { } let mut dom = VirtualDom::new(app2); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -110,7 +110,7 @@ fn components_hydrate() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -129,7 +129,7 @@ fn components_hydrate() { } let mut dom = VirtualDom::new(app2); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -145,7 +145,7 @@ fn components_hydrate() { } let mut dom = VirtualDom::new(app3); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -165,7 +165,7 @@ fn components_hydrate() { } let mut dom = VirtualDom::new(app4); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), @@ -188,7 +188,7 @@ fn hello_world_hydrates() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::pre_render(&dom), diff --git a/packages/ssr/tests/inner_html.rs b/packages/ssr/tests/inner_html.rs index 0379def55..c5941395b 100644 --- a/packages/ssr/tests/inner_html.rs +++ b/packages/ssr/tests/inner_html.rs @@ -7,7 +7,7 @@ fn static_inner_html() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!(dioxus_ssr::render(&dom), r#"
1234
"#); } @@ -20,7 +20,7 @@ fn dynamic_inner_html() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!(dioxus_ssr::render(&dom), r#"
1234
"#); } diff --git a/packages/ssr/tests/simple.rs b/packages/ssr/tests/simple.rs index dd750de30..be06e519a 100644 --- a/packages/ssr/tests/simple.rs +++ b/packages/ssr/tests/simple.rs @@ -9,7 +9,7 @@ fn simple() { } let mut dom = VirtualDom::new(App); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!(dioxus_ssr::render(&dom), "
hello!
"); diff --git a/packages/ssr/tests/styles.rs b/packages/ssr/tests/styles.rs index 963c07b48..d02968a11 100644 --- a/packages/ssr/tests/styles.rs +++ b/packages/ssr/tests/styles.rs @@ -7,7 +7,7 @@ fn static_styles() { } let mut dom = VirtualDom::new(app); - _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); assert_eq!( dioxus_ssr::render(&dom), diff --git a/packages/web/examples/hydrate.rs b/packages/web/examples/hydrate.rs index 111abbdac..b9c8e46f3 100644 --- a/packages/web/examples/hydrate.rs +++ b/packages/web/examples/hydrate.rs @@ -38,7 +38,7 @@ fn main() { tracing_wasm::set_as_global_default(); let mut dom = VirtualDom::new(app); - let _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); let pre = dioxus_ssr::pre_render(&dom); tracing::trace!("{}", pre); diff --git a/packages/web/tests/hydrate.rs b/packages/web/tests/hydrate.rs index eb9e2d26e..ffb678b32 100644 --- a/packages/web/tests/hydrate.rs +++ b/packages/web/tests/hydrate.rs @@ -41,7 +41,7 @@ fn rehydrates() { } let mut dom = VirtualDom::new(app); - let _ = dom.rebuild(&mut dioxus_core::NoOpMutations); + dom.rebuild(&mut dioxus_core::NoOpMutations); let out = dioxus_ssr::render(&dom); window()