Export as few extra modules as possible

zbraniecki · Oct 13, 2020 · b1bcf91 · b1bcf91
1 parent 0a57a3e
commit b1bcf91
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -82,11 +82,14 @@ extern crate std;
 #[cfg(all(not(feature = "std"), not(test)))]
 extern crate core as std;
 
-pub mod macros;
+mod macros;
 mod tinystr16;
 mod tinystr4;
 mod tinystr8;
 
+/// Re-export of the low-level tinystr_macros crate, required by the macros.
+pub use tinystr_macros as raw_macros;
+
 #[cfg(any(feature = "std", feature = "alloc"))]
 mod tinystrauto;
 

diff --git a/src/macros.rs b/src/macros.rs
@@ -1,6 +1,3 @@
-/// Re-export of the low-level tinystr_macros crate.
-pub use tinystr_macros;
-
 /// Macro to create a const TinyStr4, validated with zero runtime cost.
 ///
 /// The argument must be a string literal:
@@ -18,9 +15,7 @@ pub use tinystr_macros;
 #[macro_export]
 macro_rules! tinystr4 {
     ($s:literal) => {
-        unsafe {
-            $crate::TinyStr4::new_unchecked($crate::macros::tinystr_macros::u32_from_bytes!($s))
-        }
+        unsafe { $crate::TinyStr4::new_unchecked($crate::raw_macros::u32_from_bytes!($s)) }
     };
 }
 
@@ -49,9 +44,7 @@ fn test_tinystr4() {
 #[macro_export]
 macro_rules! tinystr8 {
     ($s:literal) => {
-        unsafe {
-            $crate::TinyStr8::new_unchecked($crate::macros::tinystr_macros::u64_from_bytes!($s))
-        }
+        unsafe { $crate::TinyStr8::new_unchecked($crate::raw_macros::u64_from_bytes!($s)) }
     };
 }
 
@@ -80,9 +73,7 @@ fn test_tinystr8() {
 #[macro_export]
 macro_rules! tinystr16 {
     ($s:literal) => {
-        unsafe {
-            $crate::TinyStr16::new_unchecked($crate::macros::tinystr_macros::u128_from_bytes!($s))
-        }
+        unsafe { $crate::TinyStr16::new_unchecked($crate::raw_macros::u128_from_bytes!($s)) }
     };
 }