Support having no logs at all.

Author: jonathanpallant

src/fat/volume.rs

@@ -1,18 +1,13 @@
 //! FAT volume
 
-#[cfg(feature = "log")]
-use log::{debug, trace, warn};
-
-#[cfg(feature = "defmt-log")]
-use defmt::{debug, trace, warn};
-
 use crate::{
+    debug,
     fat::{
         Bpb, Fat16Info, Fat32Info, FatSpecificInfo, FatType, InfoSector, OnDiskDirEntry,
         RESERVED_ENTRIES,
     },
-    Attributes, Block, BlockCount, BlockDevice, BlockIdx, Cluster, DirEntry, Directory, Error,
-    ShortFileName, TimeSource, VolumeManager, VolumeType,
+    trace, warn, Attributes, Block, BlockCount, BlockDevice, BlockIdx, Cluster, DirEntry,
+    Directory, Error, ShortFileName, TimeSource, VolumeManager, VolumeType,
 };
 use byteorder::{ByteOrder, LittleEndian};
 use core::convert::TryFrom;

src/lib.rs

@@ -107,6 +107,36 @@ pub use volume_mgr::VolumeManager;
 #[deprecated]
 pub use volume_mgr::VolumeManager as Controller;
 
+#[cfg(all(feature = "defmt-log", feature = "log"))]
+compile_error!("Cannot enable both log and defmt-log");
+
+#[cfg(feature = "log")]
+use log::{debug, trace, warn};
+
+#[cfg(feature = "defmt-log")]
+use defmt::{debug, trace, warn};
+
+#[cfg(all(not(feature = "defmt-log"), not(feature = "log")))]
+#[macro_export]
+/// Like log::debug! but does nothing at all
+macro_rules! debug {
+    ($($arg:tt)+) => {};
+}
+
+#[cfg(all(not(feature = "defmt-log"), not(feature = "log")))]
+#[macro_export]
+/// Like log::trace! but does nothing at all
+macro_rules! trace {
+    ($($arg:tt)+) => {};
+}
+
+#[cfg(all(not(feature = "defmt-log"), not(feature = "log")))]
+#[macro_export]
+/// Like log::warn! but does nothing at all
+macro_rules! warn {
+    ($($arg:tt)+) => {};
+}
+
 // ****************************************************************************
 //
 // Public Types

src/sdcard/mod.rs

@@ -7,25 +7,15 @@
 
 pub mod proto;
 
-use super::{Block, BlockCount, BlockDevice, BlockIdx};
+use crate::{trace, Block, BlockCount, BlockDevice, BlockIdx};
 use core::cell::RefCell;
 use proto::*;
 
 // =============================================================================
 // Imports
 // =============================================================================
 
-#[cfg(feature = "log")]
-use log::{debug, trace, warn};
-
-#[cfg(feature = "defmt-log")]
-use defmt::{debug, trace, warn};
-
-#[cfg(all(feature = "defmt-log", feature = "log"))]
-compile_error!("Cannot enable both log and defmt-log");
-
-#[cfg(all(not(feature = "defmt-log"), not(feature = "log")))]
-compile_error!("Must enable either log or defmt-log");
+use crate::{debug, warn};
 
 // =============================================================================
 // Constants
@@ -141,14 +131,14 @@ where
         &self,
         blocks: &mut [Block],
         start_block_idx: BlockIdx,
-        reason: &str,
+        _reason: &str,
     ) -> Result<(), Self::Error> {
         let mut inner = self.inner.borrow_mut();
         debug!(
             "Read {} blocks @ {} for {}",
             blocks.len(),
             start_block_idx.0,
-            reason
+            _reason
         );
         inner.check_init()?;
         inner.read(blocks, start_block_idx)
@@ -415,9 +405,9 @@ where
                     Ok(R1_IDLE_STATE) => {
                         break;
                     }
-                    Ok(r) => {
+                    Ok(_r) => {
                         // Try again
-                        warn!("Got response: {:x}, trying again..", r);
+                        warn!("Got response: {:x}, trying again..", _r);
                     }
                 }
 

src/volume_mgr.rs

@@ -3,18 +3,12 @@
 use byteorder::{ByteOrder, LittleEndian};
 use core::convert::TryFrom;
 
-#[cfg(feature = "log")]
-use log::debug;
-
-#[cfg(feature = "defmt-log")]
-use defmt::debug;
-
 use crate::fat::{self, RESERVED_ENTRIES};
 use crate::filesystem::{
     Attributes, Cluster, DirEntry, Directory, File, Mode, ShortFileName, TimeSource, MAX_FILE_SIZE,
 };
 use crate::{
-    Block, BlockCount, BlockDevice, BlockIdx, Error, Volume, VolumeIdx, VolumeType,
+    debug, Block, BlockCount, BlockDevice, BlockIdx, Error, Volume, VolumeIdx, VolumeType,
     PARTITION_ID_FAT16, PARTITION_ID_FAT16_LBA, PARTITION_ID_FAT32_CHS_LBA, PARTITION_ID_FAT32_LBA,
 };