fix: clippy lints (#11)

shuoli84 · Aug 3, 2024 · 262ca9a · 262ca9a
1 parent bc7c477
commit 262ca9a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/examples/basic.rs b/examples/basic.rs
@@ -162,7 +162,11 @@ impl Widget for &mut App {
             .block(Block::bordered().title("Content").on_black())
             .render(main, buf);
 
-        "tui-menu".bold().blue().to_centered_line().render(top, buf);
+        "tui-menu"
+            .bold()
+            .blue()
+            .into_centered_line()
+            .render(top, buf);
 
         // draw menu last, so it renders on top of other content
         Menu::new().render(top, buf, &mut self.menu);

diff --git a/src/lib.rs b/src/lib.rs
@@ -110,7 +110,7 @@ impl<T: Clone> MenuState<T> {
                 .and_then(|child| child.highlight_child_index())
             {
                 // case 1
-                Some(idx) if idx == 0 => {
+                Some(0) => {
                     self.pop();
                 }
                 _ => {
@@ -262,10 +262,8 @@ impl<T: Clone> MenuState<T> {
         if let Some(item) = self.root_item.highlight_mut() {
             if !item.children.is_empty() {
                 self.push();
-            } else {
-                if let Some(ref data) = item.data {
-                    self.events.push(MenuEvent::Selected(data.clone()));
-                }
+            } else if let Some(ref data) = item.data {
+                self.events.push(MenuEvent::Selected(data.clone()));
             }
         }
     }
@@ -361,7 +359,7 @@ impl<T> MenuItem<T> {
     /// highlight first child
     fn highlight_first_child(&mut self) -> Option<()> {
         if !self.children.is_empty() {
-            if let Some(it) = self.children.iter_mut().nth(0) {
+            if let Some(it) = self.children.get_mut(0) {
                 it.is_highlight = true;
             }
             Some(())
@@ -468,8 +466,7 @@ impl<T> MenuItem<T> {
         let mut last_but_one = self;
         while last_but_one
             .highlight_child_mut()
-            .map(|x| x.highlight_child_mut())
-            .flatten()
+            .and_then(|x| x.highlight_child_mut())
             .is_some()
         {
             last_but_one = last_but_one.highlight_child_mut().unwrap();
@@ -533,7 +530,7 @@ impl<T> Menu<T> {
         y: u16,
         group: &[MenuItem<T>],
         buf: &mut ratatui::buffer::Buffer,
-        depth: usize,
+        _depth: usize,
     ) {
         let area = Rect::new(x, y, self.drop_down_width, group.len() as u16);
         Clear.render(area, buf);
@@ -544,7 +541,7 @@ impl<T> Menu<T> {
             let is_active = item.is_highlight;
 
             buf.set_span(
-                x as u16,
+                x,
                 item_y,
                 &Span::styled(
                     item.name(),
@@ -564,13 +561,19 @@ impl<T> Menu<T> {
                     item_y,
                     &item.children,
                     buf,
-                    depth + 1,
+                    _depth + 1,
                 );
             }
         }
     }
 }
 
+impl<T> Default for Menu<T> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl<T> StatefulWidget for Menu<T> {
     type State = MenuState<T>;
 
@@ -594,7 +597,7 @@ impl<T> StatefulWidget for Menu<T> {
             spans.push(span);
 
             if has_children && is_highlight {
-                self.render_drop_down(group_x_pos as u16, y_pos as u16 + 1, &item.children, buf, 1);
+                self.render_drop_down(group_x_pos as u16, y_pos + 1, &item.children, buf, 1);
             }
 
             if idx < state.root_item.children.len() - 1 {