Minor improvements

Author: dylni

src/common/raw.rs

@@ -8,7 +8,7 @@ pub(crate) const fn is_continuation(_: u8) -> bool {
 
 #[inline(always)]
 pub(crate) fn decode_code_point(_: &[u8]) -> u32 {
-    unreachable!()
+    unreachable!();
 }
 
 pub(crate) fn ends_with(string: &[u8], suffix: &[u8]) -> bool {

src/lib.rs

@@ -68,16 +68,16 @@
 //!
 //! - **memchr** -
 //!   Changes the implementation to use crate [memchr] for better performance.
-//!   This feature is useless when "raw_os_str" is disabled.
+//!   This feature is useless when "raw\_os\_str" is disabled.
 //!
 //!   For more information, see [`RawOsStr`][memchr complexity].
 //!
-//! - **raw_os_str** -
+//! - **raw\_os\_str** -
 //!   Enables use of [`RawOsStr`] and [`RawOsString`].
 //!
 //! ### Optional Features
 //!
-//! - **print_bytes** -
+//! - **print\_bytes** -
 //!   Provides implementations of [`print_bytes::ToBytes`] for [`RawOsStr`] and
 //!   [`RawOsString`].
 //!

src/raw_str.rs

@@ -18,26 +18,18 @@ use std::ops::RangeTo;
 use std::ops::RangeToInclusive;
 use std::str;
 
+#[cfg(feature = "memchr")]
+use memchr::memmem::find;
+#[cfg(feature = "memchr")]
+use memchr::memmem::rfind;
+
 use super::imp::raw;
 use super::iter::Split;
 use super::pattern::Encoded as EncodedPattern;
 use super::OsStrBytes;
 use super::OsStringBytes;
 use super::Pattern;
 
-#[cfg(feature = "memchr")]
-use memchr::memmem::find;
-#[cfg(feature = "memchr")]
-use memchr::memmem::rfind;
-
-#[cfg(feature = "print_bytes")]
-use print_bytes::Bytes;
-#[cfg(feature = "print_bytes")]
-use print_bytes::ToBytes;
-
-#[cfg(feature = "uniquote")]
-use uniquote::Quote;
-
 #[cfg(not(feature = "memchr"))]
 fn find(string: &[u8], pat: &[u8]) -> Option<usize> {
     for i in 0..=string.len().checked_sub(pat.len())? {
@@ -67,9 +59,6 @@ macro_rules! impl_trim_matches {
         }
 
         let mut string = &$self.0;
-        #[allow(unused_mut)]
-        #[allow(unused_variables)]
-        let mut matches = 0;
         while let Some(substring) = string.$strip_method(pat) {
             string = substring;
         }
@@ -826,24 +815,6 @@ r#impl!(RangeInclusive<usize>, x, *x.start(), x.end().wrapping_add(1));
 r#impl!(RangeTo<usize>, x, x.end);
 r#impl!(RangeToInclusive<usize>, x, x.end.wrapping_add(1));
 
-#[cfg(feature = "uniquote")]
-#[cfg_attr(os_str_bytes_docs_rs, doc(cfg(feature = "uniquote")))]
-impl Quote for RawOsStr {
-    #[inline]
-    fn escape(&self, f: &mut uniquote::Formatter<'_>) -> uniquote::Result {
-        self.0.escape(f)
-    }
-}
-
-#[cfg(feature = "print_bytes")]
-#[cfg_attr(os_str_bytes_docs_rs, doc(cfg(feature = "print_bytes")))]
-impl ToBytes for RawOsStr {
-    #[inline]
-    fn to_bytes(&self) -> Bytes<'_> {
-        self.0.to_bytes()
-    }
-}
-
 impl ToOwned for RawOsStr {
     type Owned = RawOsString;
 
@@ -1030,24 +1001,6 @@ r#impl!(RangeInclusive<usize>);
 r#impl!(RangeTo<usize>);
 r#impl!(RangeToInclusive<usize>);
 
-#[cfg(feature = "uniquote")]
-#[cfg_attr(os_str_bytes_docs_rs, doc(cfg(feature = "uniquote")))]
-impl Quote for RawOsString {
-    #[inline]
-    fn escape(&self, f: &mut uniquote::Formatter<'_>) -> uniquote::Result {
-        (**self).escape(f)
-    }
-}
-
-#[cfg(feature = "print_bytes")]
-#[cfg_attr(os_str_bytes_docs_rs, doc(cfg(feature = "print_bytes")))]
-impl ToBytes for RawOsString {
-    #[inline]
-    fn to_bytes(&self) -> Bytes<'_> {
-        (**self).to_bytes()
-    }
-}
-
 struct Buffer<'a>(&'a [u8]);
 
 impl Debug for Buffer<'_> {
@@ -1132,3 +1085,52 @@ r#impl!(&RawOsStr, String);
 r#impl!(RawOsString, str);
 r#impl!(RawOsString, &str);
 r#impl!(RawOsString, String);
+
+#[cfg(feature = "print_bytes")]
+#[cfg_attr(os_str_bytes_docs_rs, doc(cfg(feature = "print_bytes")))]
+mod print_bytes {
+    use print_bytes::Bytes;
+    use print_bytes::ToBytes;
+
+    use super::RawOsStr;
+    use super::RawOsString;
+
+    impl ToBytes for RawOsStr {
+        #[inline]
+        fn to_bytes(&self) -> Bytes<'_> {
+            self.0.to_bytes()
+        }
+    }
+
+    impl ToBytes for RawOsString {
+        #[inline]
+        fn to_bytes(&self) -> Bytes<'_> {
+            (**self).to_bytes()
+        }
+    }
+}
+
+#[cfg(feature = "uniquote")]
+#[cfg_attr(os_str_bytes_docs_rs, doc(cfg(feature = "uniquote")))]
+mod uniquote {
+    use uniquote::Formatter;
+    use uniquote::Quote;
+    use uniquote::Result;
+
+    use super::RawOsStr;
+    use super::RawOsString;
+
+    impl Quote for RawOsStr {
+        #[inline]
+        fn escape(&self, f: &mut Formatter<'_>) -> Result {
+            self.0.escape(f)
+        }
+    }
+
+    impl Quote for RawOsString {
+        #[inline]
+        fn escape(&self, f: &mut Formatter<'_>) -> Result {
+            (**self).escape(f)
+        }
+    }
+}

src/wasm32/raw.rs

@@ -7,7 +7,9 @@ pub(crate) use crate::util::is_continuation;
 pub(crate) fn decode_code_point(string: &[u8]) -> u32 {
     let string = str::from_utf8(string).expect("invalid string");
     let mut chs = string.chars();
-    let ch = chs.next().expect("cannot parse code point from empty string");
+    let ch = chs
+        .next()
+        .expect("cannot parse code point from empty string");
     assert_eq!(None, chs.next(), "multiple code points found");
     ch.into()
 }