Fix defmt logging.

Author: thejpster

Cargo.toml

@@ -26,4 +26,5 @@ chrono = "0.4"
 
 [features]
 default = ["log"]
-defmt-log = ["defmt"]
+defmt-log = ["dep:defmt"]
+log = ["dep:log"]

src/filesystem/directory.rs

@@ -75,7 +75,6 @@ impl RawDirectory {
 /// If you drop a value of this type, it closes the directory automatically. However,
 /// it holds a mutable reference to its parent `VolumeManager`, which restricts
 /// which operations you can perform.
-#[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
 pub struct Directory<
     'a,
     D,
@@ -194,6 +193,18 @@ where
     }
 }
 
+#[cfg(feature = "defmt-log")]
+impl<'a, D, T, const MAX_DIRS: usize, const MAX_FILES: usize, const MAX_VOLUMES: usize>
+    defmt::Format for Directory<'a, D, T, MAX_DIRS, MAX_FILES, MAX_VOLUMES>
+where
+    D: crate::BlockDevice,
+    T: crate::TimeSource,
+{
+    fn format(&self, fmt: defmt::Formatter) {
+        defmt::write!(fmt, "Directory({})", self.raw_directory.0 .0)
+    }
+}
+
 /// Holds information about an open file on disk
 #[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
 #[derive(Debug, Clone)]

src/filesystem/files.rs

@@ -42,7 +42,6 @@ impl RawFile {
 /// If you drop a value of this type, it closes the file automatically. However,
 /// it holds a mutable reference to its parent `VolumeManager`, which restricts
 /// which operations you can perform.
-#[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
 pub struct File<'a, D, T, const MAX_DIRS: usize, const MAX_FILES: usize, const MAX_VOLUMES: usize>
 where
     D: crate::BlockDevice,
@@ -150,6 +149,18 @@ where
     }
 }
 
+#[cfg(feature = "defmt-log")]
+impl<'a, D, T, const MAX_DIRS: usize, const MAX_FILES: usize, const MAX_VOLUMES: usize>
+    defmt::Format for File<'a, D, T, MAX_DIRS, MAX_FILES, MAX_VOLUMES>
+where
+    D: crate::BlockDevice,
+    T: crate::TimeSource,
+{
+    fn format(&self, fmt: defmt::Formatter) {
+        defmt::write!(fmt, "File({})", self.raw_file.0 .0)
+    }
+}
+
 /// Errors related to file operations
 #[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

src/lib.rs

@@ -263,7 +263,6 @@ impl RawVolume {
 /// If you drop a value of this type, it closes the volume automatically. However,
 /// it holds a mutable reference to its parent `VolumeManager`, which restricts
 /// which operations you can perform.
-#[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
 pub struct Volume<'a, D, T, const MAX_DIRS: usize, const MAX_FILES: usize, const MAX_VOLUMES: usize>
 where
     D: crate::BlockDevice,
@@ -333,6 +332,18 @@ where
     }
 }
 
+#[cfg(feature = "defmt-log")]
+impl<'a, D, T, const MAX_DIRS: usize, const MAX_FILES: usize, const MAX_VOLUMES: usize>
+    defmt::Format for Volume<'a, D, T, MAX_DIRS, MAX_FILES, MAX_VOLUMES>
+where
+    D: crate::BlockDevice,
+    T: crate::TimeSource,
+{
+    fn format(&self, fmt: defmt::Formatter) {
+        defmt::write!(fmt, "Volume({})", self.raw_volume.0 .0)
+    }
+}
+
 /// Internal information about a Volume
 #[cfg_attr(feature = "defmt-log", derive(defmt::Format))]
 #[derive(Debug, PartialEq, Eq)]