From ec31014966a07e0c4dbfe6fe768b73d7fa4b5b5d Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Sat, 28 Jan 2023 15:06:03 -0600 Subject: [PATCH] fix clippy in TUI --- packages/tui/src/focus.rs | 12 ++++----- packages/tui/src/layout.rs | 4 +-- packages/tui/src/lib.rs | 7 +++-- .../tui/src/{node.rs => prevent_default.rs} | 20 +++----------- packages/tui/src/render.rs | 26 +++++-------------- packages/tui/src/style_attributes.rs | 6 ++--- 6 files changed, 24 insertions(+), 51 deletions(-) rename packages/tui/src/{node.rs => prevent_default.rs} (78%) diff --git a/packages/tui/src/focus.rs b/packages/tui/src/focus.rs index 4441f44f3..430964637 100644 --- a/packages/tui/src/focus.rs +++ b/packages/tui/src/focus.rs @@ -1,4 +1,4 @@ -use crate::node::PreventDefault; +use crate::prevent_default::PreventDefault; use dioxus_native_core::{ node_ref::{AttributeMaskBuilder, NodeMaskBuilder}, @@ -75,10 +75,10 @@ impl Pass for Focus { fn pass<'a>( &mut self, node_view: NodeView, - node: ::ElementBorrowed<'a>, - parent: Option<::ElementBorrowed<'a>>, - children: Option::ElementBorrowed<'a>>>, - context: &SendAnyMap, + _: ::ElementBorrowed<'a>, + _: Option<::ElementBorrowed<'a>>, + _: Option::ElementBorrowed<'a>>>, + _: &SendAnyMap, ) -> bool { let new = Focus { level: if let Some(a) = node_view @@ -291,7 +291,7 @@ impl FocusState { let mut node = rdom.get_mut_raw(old).unwrap(); node.get_mut::().unwrap().0 = false; } - let mut node = &mut rdom.get_mut_raw(id).unwrap(); + let mut node = rdom.get_mut_raw(id).unwrap(); node.get_mut::().unwrap().0 = true; self.focus_level = node.get::().unwrap().level; // reset the position to the currently focused element diff --git a/packages/tui/src/layout.rs b/packages/tui/src/layout.rs index 87241a287..5115de1e9 100644 --- a/packages/tui/src/layout.rs +++ b/packages/tui/src/layout.rs @@ -54,8 +54,8 @@ impl Pass for TaffyLayout { fn pass<'a>( &mut self, node_view: NodeView, - node: ::ElementBorrowed<'a>, - parent: Option<::ElementBorrowed<'a>>, + _: ::ElementBorrowed<'a>, + _: Option<::ElementBorrowed<'a>>, children: Option::ElementBorrowed<'a>>>, ctx: &SendAnyMap, ) -> bool { diff --git a/packages/tui/src/lib.rs b/packages/tui/src/lib.rs index 99d531215..295722d93 100644 --- a/packages/tui/src/lib.rs +++ b/packages/tui/src/lib.rs @@ -7,7 +7,7 @@ use crossterm::{ }; use dioxus_core::*; use dioxus_native_core::{node_ref::NodeMaskBuilder, real_dom::NodeImmutable, Pass}; -use dioxus_native_core::{real_dom::RealDom, FxDashSet, NodeId, NodeMask, SendAnyMap}; +use dioxus_native_core::{real_dom::RealDom, FxDashSet, NodeId, SendAnyMap}; use focus::FocusState; use futures::{ channel::mpsc::{UnboundedReceiver, UnboundedSender}, @@ -30,8 +30,8 @@ mod config; mod focus; mod hooks; mod layout; -mod node; pub mod prelude; +mod prevent_default; pub mod query; mod render; mod style; @@ -41,7 +41,6 @@ mod widgets; pub use config::*; pub use hooks::*; -pub(crate) use node::*; // the layout space has a multiplier of 10 to minimize rounding errors pub(crate) fn screen_to_layout_space(screen: u16) -> f32 { @@ -215,7 +214,7 @@ fn render_vdom( // size is guaranteed to not change when rendering resize(frame.size(), &mut taffy, &rdom); let root = rdom.get(NodeId(0)).unwrap(); - render::render_vnode(frame, &taffy, &rdom, root, cfg, Point::ZERO); + render::render_vnode(frame, &taffy, root, cfg, Point::ZERO); })?; execute!(terminal.backend_mut(), RestorePosition, Show).unwrap(); } else { diff --git a/packages/tui/src/node.rs b/packages/tui/src/prevent_default.rs similarity index 78% rename from packages/tui/src/node.rs rename to packages/tui/src/prevent_default.rs index 3d38d1cd7..7755e610c 100644 --- a/packages/tui/src/node.rs +++ b/packages/tui/src/prevent_default.rs @@ -1,17 +1,5 @@ -use crate::focus::Focus; -use crate::layout::TaffyLayout; -use crate::style_attributes::StyleModifier; use dioxus_native_core::{node_ref::NodeView, Dependancy, Pass, SendAnyMap}; -#[derive(Debug, Clone, Default)] -pub(crate) struct NodeState { - pub layout: TaffyLayout, - pub style: StyleModifier, - pub prevent_default: PreventDefault, - pub focus: Focus, - pub focused: bool, -} - #[derive(PartialEq, Debug, Clone, Copy)] pub(crate) enum PreventDefault { Focus, @@ -52,10 +40,10 @@ impl Pass for PreventDefault { fn pass<'a>( &mut self, node_view: NodeView, - node: ::ElementBorrowed<'a>, - parent: Option<::ElementBorrowed<'a>>, - children: Option::ElementBorrowed<'a>>>, - context: &SendAnyMap, + _: ::ElementBorrowed<'a>, + _: Option<::ElementBorrowed<'a>>, + _: Option::ElementBorrowed<'a>>>, + _: &SendAnyMap, ) -> bool { let new = match node_view.attributes().and_then(|mut attrs| { attrs diff --git a/packages/tui/src/render.rs b/packages/tui/src/render.rs index 372d26183..17355b5b5 100644 --- a/packages/tui/src/render.rs +++ b/packages/tui/src/render.rs @@ -1,15 +1,11 @@ -use dioxus_native_core::{real_dom::NodeImmutable, NodeRef, RealDom}; +use dioxus_native_core::{real_dom::NodeImmutable, NodeRef}; use std::io::Stdout; use taffy::{ geometry::Point, prelude::{Dimension, Layout, Size}, Taffy, }; -use tui::{ - backend::CrosstermBackend, - layout::Rect, - style::{Color, Style}, -}; +use tui::{backend::CrosstermBackend, layout::Rect, style::Color}; use crate::{ focus::Focused, @@ -26,7 +22,6 @@ const RADIUS_MULTIPLIER: [f32; 2] = [1.0, 0.5]; pub(crate) fn render_vnode( frame: &mut tui::Frame>, layout: &Taffy, - rdom: &RealDom, node: NodeRef, cfg: Config, parent_location: Point, @@ -91,7 +86,7 @@ pub(crate) fn render_vnode( } for c in node.children().unwrap() { - render_vnode(frame, layout, rdom, c, cfg, location); + render_vnode(frame, layout, c, cfg, location); } } NodeType::Placeholder => unreachable!(), @@ -123,10 +118,7 @@ impl RinkWidget for NodeRef<'_> { [0, 1] => Direction::Down, [0, -1] => Direction::Up, [a, b] => { - panic!( - "draw({:?} {:?} {:?}) {}, {} no cell adjacent", - before, current, after, a, b - ) + panic!("draw({before:?} {current:?} {after:?}) {a}, {b} no cell adjacent") } }; let end_dir = match [after[0] - current[0], after[1] - current[1]] { @@ -135,10 +127,7 @@ impl RinkWidget for NodeRef<'_> { [0, 1] => Direction::Down, [0, -1] => Direction::Up, [a, b] => { - panic!( - "draw({:?} {:?} {:?}) {}, {} no cell adjacent", - before, current, after, a, b - ) + panic!("draw({before:?} {current:?} {after:?}) {a}, {b} no cell adjacent") } }; @@ -159,10 +148,7 @@ impl RinkWidget for NodeRef<'_> { [Direction::Left, Direction::Up] => symbols.bottom_right, [Direction::Left, Direction::Right] => symbols.horizontal, [Direction::Left, Direction::Down] => symbols.top_right, - _ => panic!( - "{:?} {:?} {:?} cannont connect cell to itself", - before, current, after - ), + _ => panic!("{before:?} {current:?} {after:?} cannont connect cell to itself"), } .to_string(); buf.set( diff --git a/packages/tui/src/style_attributes.rs b/packages/tui/src/style_attributes.rs index 75b956ecd..ada2ace9a 100644 --- a/packages/tui/src/style_attributes.rs +++ b/packages/tui/src/style_attributes.rs @@ -58,10 +58,10 @@ impl Pass for StyleModifier { fn pass<'a>( &mut self, node_view: NodeView, - node: ::ElementBorrowed<'a>, + _: ::ElementBorrowed<'a>, parent: Option<::ElementBorrowed<'a>>, - children: Option::ElementBorrowed<'a>>>, - context: &SendAnyMap, + _: Option::ElementBorrowed<'a>>>, + _: &SendAnyMap, ) -> bool { let mut new = StyleModifier::default(); if parent.is_some() {