actual debug impl

edwloef · Jan 4, 2025 · eca2ee5 · eca2ee5
1 parent 86e9ade
commit eca2ee5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 27 deletions.
diff --git a/src/dir.rs b/src/dir.rs
@@ -15,7 +15,6 @@ use iced::{
 };
 use std::{
     cell::{OnceCell, RefCell},
-    fmt::{Debug, Formatter},
     ops::Deref,
     path::PathBuf,
     rc::Rc,
@@ -43,7 +42,7 @@ impl<Message> Default for State<Message> {
 #[expect(clippy::type_complexity)]
 #[derive(Clone)]
 pub struct Dir<Message> {
-    path: PathBuf,
+    pub path: PathBuf,
     name: String,
     dirs: OnceCell<Rc<[Dir<Message>]>>,
     files: OnceCell<Rc<[File<Message>]>>,
@@ -53,15 +52,6 @@ pub struct Dir<Message> {
     pub show_extensions: bool,
 }
 
-impl<Message> Debug for Dir<Message> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Dir")
-            .field("path", &self.path)
-            .field("show_hidden", &self.show_hidden)
-            .finish_non_exhaustive()
-    }
-}
-
 impl<Message> Dir<Message>
 where
     Message: Clone + 'static,

diff --git a/src/file.rs b/src/file.rs
@@ -13,12 +13,7 @@ use iced::{
     event::Status,
     Event, Length, Rectangle, Renderer, Size, Theme, Vector,
 };
-use std::{
-    cell::RefCell,
-    fmt::{Debug, Formatter},
-    path::PathBuf,
-    rc::Rc,
-};
+use std::{cell::RefCell, path::PathBuf, rc::Rc};
 
 const FILE: &[u8] = include_bytes!("../assets/system-uicons--document.svg");
 
@@ -36,14 +31,6 @@ pub struct File<Message> {
     on_double_click: Rc<RefCell<Option<Box<dyn Fn(PathBuf) -> Message>>>>,
 }
 
-impl<Message> Debug for File<Message> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("File")
-            .field("path", &self.path)
-            .finish_non_exhaustive()
-    }
-}
-
 impl<Message> File<Message> {
     #[expect(clippy::type_complexity)]
     pub fn new_inner(

diff --git a/src/file_tree.rs b/src/file_tree.rs
@@ -10,7 +10,11 @@ use iced::{
     mouse::Cursor,
     Element, Event, Length, Rectangle, Renderer, Size, Theme,
 };
-use std::{path::PathBuf, rc::Rc};
+use std::{
+    fmt::{Debug, Formatter},
+    path::PathBuf,
+    rc::Rc,
+};
 
 /// A lightweight file tree widget for the [iced](https://github.com/iced-rs/iced/tree/master) toolkit.
 ///
@@ -35,9 +39,18 @@ use std::{path::PathBuf, rc::Rc};
 ///     .into()
 /// }
 /// ```
-#[derive(Debug)]
 pub struct FileTree<Message>(Dir<Message>);
 
+impl<Message> Debug for FileTree<Message> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Dir")
+            .field("path", &self.0.path)
+            .field("show_hidden", &self.0.show_hidden)
+            .field("show_extensions", &self.0.show_hidden)
+            .finish()
+    }
+}
+
 /// Creates a new [`FileTree`] with the root at the given path.
 #[must_use]
 pub fn file_tree<Message>(path: PathBuf) -> Option<FileTree<Message>>