From db5b65b6cb6f65019a759613ad8ee56fe4e4b93a Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Wed, 7 Dec 2022 14:51:14 -0800 Subject: [PATCH] chore: make cargo check happy with new apis --- packages/core/src/events.rs | 3 +- packages/hooks/src/useeffect.rs | 4 +- packages/hooks/src/usefuture.rs | 4 +- .../tests/called_minimally_on_build.rs | 1 - .../native-core-macro/tests/update_state.rs | 4 +- packages/tui/tests/margin.rs | 91 ------------------- packages/web/tests/hydrate.rs | 2 +- 7 files changed, 8 insertions(+), 101 deletions(-) delete mode 100644 packages/tui/tests/margin.rs diff --git a/packages/core/src/events.rs b/packages/core/src/events.rs index 583f44c33..9ab01e4d9 100644 --- a/packages/core/src/events.rs +++ b/packages/core/src/events.rs @@ -21,7 +21,8 @@ use std::{ /// } /// ``` pub struct Event { - pub(crate) data: Rc, + /// The data associated with this event + pub data: Rc, pub(crate) propogates: Rc>, } diff --git a/packages/hooks/src/useeffect.rs b/packages/hooks/src/useeffect.rs index 423e5bc23..f9ef70b84 100644 --- a/packages/hooks/src/useeffect.rs +++ b/packages/hooks/src/useeffect.rs @@ -77,12 +77,12 @@ mod tests { }); // runs when a is changed - use_effect(cx, (cx.props.a,), |(a,)| async move { + use_effect(cx, (&cx.props.a,), |(a,)| async move { // }); // runs when a or b is changed - use_effect(cx, (cx.props.a, &cx.props.b), |(a, b)| async move { + use_effect(cx, (&cx.props.a, &cx.props.b), |(a, b)| async move { // }); diff --git a/packages/hooks/src/usefuture.rs b/packages/hooks/src/usefuture.rs index efea87f4e..df34a6433 100644 --- a/packages/hooks/src/usefuture.rs +++ b/packages/hooks/src/usefuture.rs @@ -319,10 +319,10 @@ mod tests { let fut = use_future(cx, (), |_| async move {}); // runs when a is changed - let fut = use_future(cx, (cx.props.a,), |(a,)| async move {}); + let fut = use_future(cx, (&cx.props.a,), |(a,)| async move {}); // runs when a or b is changed - let fut = use_future(cx, (cx.props.a, &cx.props.b), |(a, b)| async move { 123 }); + let fut = use_future(cx, (&cx.props.a, &cx.props.b), |(a, b)| async move { 123 }); let a = use_future!(cx, || async move { // do the thing! diff --git a/packages/native-core-macro/tests/called_minimally_on_build.rs b/packages/native-core-macro/tests/called_minimally_on_build.rs index 84e4fb0e6..69454dc43 100644 --- a/packages/native-core-macro/tests/called_minimally_on_build.rs +++ b/packages/native-core-macro/tests/called_minimally_on_build.rs @@ -1,4 +1,3 @@ -use anymap::AnyMap; use dioxus::prelude::*; use dioxus_native_core::node_ref::*; use dioxus_native_core::real_dom::*; diff --git a/packages/native-core-macro/tests/update_state.rs b/packages/native-core-macro/tests/update_state.rs index b9b36c8ca..e2f04c72c 100644 --- a/packages/native-core-macro/tests/update_state.rs +++ b/packages/native-core-macro/tests/update_state.rs @@ -1,10 +1,8 @@ -use dioxus::core::ElementId; -use dioxus::core::{AttributeValue, Mutations}; use dioxus::prelude::*; use dioxus_native_core::real_dom::*; use dioxus_native_core::state::{ChildDepState, NodeDepState, ParentDepState, State}; use dioxus_native_core::tree::TreeView; -use dioxus_native_core::{node_ref::*, NodeId, RealNodeId, SendAnyMap}; +use dioxus_native_core::{node_ref::*, NodeId, SendAnyMap}; use dioxus_native_core_macro::State; #[derive(Debug, Clone, Default, State)] diff --git a/packages/tui/tests/margin.rs b/packages/tui/tests/margin.rs deleted file mode 100644 index 3151f3ba7..000000000 --- a/packages/tui/tests/margin.rs +++ /dev/null @@ -1,91 +0,0 @@ -#[test] -fn margin_and_flex_row() { - let mut taffy = taffy::Taffy::new(); - let node0 = taffy - .new_node( - taffy::style::Style { - flex_grow: 1f32, - margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), - ..Default::default() - }, - ..Default::default() - }, - &[], - ) - .unwrap(); - let node = taffy - .new_node( - taffy::style::Style { - size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), - }, - ..Default::default() - }, - &[node0], - ) - .unwrap(); - taffy - .compute_layout(node, taffy::geometry::Size::undefined()) - .unwrap(); - assert_eq!(taffy.layout(node).unwrap().size.width, 100f32); - assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); - assert_eq!(taffy.layout(node).unwrap().location.x, 0f32); - assert_eq!(taffy.layout(node).unwrap().location.y, 0f32); - assert_eq!(taffy.layout(node0).unwrap().size.width, 80f32); - assert_eq!(taffy.layout(node0).unwrap().size.height, 100f32); - assert_eq!(taffy.layout(node0).unwrap().location.x, 10f32); - assert_eq!(taffy.layout(node0).unwrap().location.y, 0f32); -} - -#[test] -fn margin_and_flex_row2() { - let mut taffy = taffy::Taffy::new(); - let node0 = taffy - .new_node( - taffy::style::Style { - flex_grow: 1f32, - margin: taffy::geometry::Rect { - // left - start: taffy::style::Dimension::Points(10f32), - - // right? - end: taffy::style::Dimension::Points(10f32), - - // top? - // top: taffy::style::Dimension::Points(10f32), - - // bottom? - // bottom: taffy::style::Dimension::Points(10f32), - ..Default::default() - }, - ..Default::default() - }, - &[], - ) - .unwrap(); - - let node = taffy - .new_node( - taffy::style::Style { - size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), - }, - ..Default::default() - }, - &[node0], - ) - .unwrap(); - - taffy - .compute_layout(node, taffy::geometry::Size::undefined()) - .unwrap(); - - assert_eq!(taffy.layout(node).unwrap().size.width, 100f32); - assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); - assert_eq!(taffy.layout(node).unwrap().location.x, 0f32); - assert_eq!(taffy.layout(node).unwrap().location.y, 0f32); -} diff --git a/packages/web/tests/hydrate.rs b/packages/web/tests/hydrate.rs index d0b5acb9c..936466a14 100644 --- a/packages/web/tests/hydrate.rs +++ b/packages/web/tests/hydrate.rs @@ -50,7 +50,7 @@ fn rehydrates() { let mut dom = VirtualDom::new(app); let _ = dom.rebuild(); - let out = dioxus_ssr::render_vdom_cfg(&dom, Default::default()); + let out = dioxus_ssr::render(&dom); window() .unwrap()