Rearrange files

dylni · Nov 4, 2023 · 7140754 · 7140754
1 parent 81ac84b
commit 7140754
Show file tree

Hide file tree

Showing 15 changed files with 243 additions and 223 deletions.
diff --git a/src/common/convert.rs b/src/common/convert.rs
@@ -0,0 +1,41 @@
+use std::borrow::Cow;
+use std::convert::Infallible;
+use std::ffi::OsStr;
+use std::ffi::OsString;
+use std::result;
+
+#[cfg(all(target_vendor = "fortanix", target_env = "sgx"))]
+use std::os::fortanix_sgx as os;
+#[cfg(target_os = "hermit")]
+use std::os::hermit as os;
+#[cfg(target_os = "solid_asp3")]
+use std::os::solid as os;
+#[cfg(unix)]
+use std::os::unix as os;
+#[cfg(target_os = "wasi")]
+use std::os::wasi as os;
+#[cfg(target_os = "xous")]
+use std::os::xous as os;
+
+use os::ffi::OsStrExt;
+use os::ffi::OsStringExt;
+
+pub(crate) type EncodingError = Infallible;
+
+pub(crate) type Result<T> = result::Result<T, EncodingError>;
+
+pub(crate) fn os_str_from_bytes(string: &[u8]) -> Result<Cow<'_, OsStr>> {
+    Ok(Cow::Borrowed(OsStrExt::from_bytes(string)))
+}
+
+pub(crate) fn os_str_to_bytes(os_string: &OsStr) -> Cow<'_, [u8]> {
+    Cow::Borrowed(OsStrExt::as_bytes(os_string))
+}
+
+pub(crate) fn os_string_from_vec(string: Vec<u8>) -> Result<OsString> {
+    Ok(OsStringExt::from_vec(string))
+}
+
+pub(crate) fn os_string_into_vec(os_string: OsString) -> Vec<u8> {
+    OsStringExt::into_vec(os_string)
+}
diff --git a/src/common/mod.rs b/src/common/mod.rs
@@ -1,45 +1,7 @@
-use std::borrow::Cow;
-use std::convert::Infallible;
-use std::ffi::OsStr;
-use std::ffi::OsString;
-use std::result;
-
-#[cfg(all(target_vendor = "fortanix", target_env = "sgx"))]
-use std::os::fortanix_sgx as os;
-#[cfg(target_os = "hermit")]
-use std::os::hermit as os;
-#[cfg(target_os = "solid_asp3")]
-use std::os::solid as os;
-#[cfg(unix)]
-use std::os::unix as os;
-#[cfg(target_os = "wasi")]
-use std::os::wasi as os;
-#[cfg(target_os = "xous")]
-use std::os::xous as os;
-
-use os::ffi::OsStrExt;
-use os::ffi::OsStringExt;
+if_conversions! {
+    pub(super) mod convert;
+}
 
 if_raw_str! {
     pub(super) mod raw;
 }
-
-pub(super) type EncodingError = Infallible;
-
-pub(super) type Result<T> = result::Result<T, EncodingError>;
-
-pub(super) fn os_str_from_bytes(string: &[u8]) -> Result<Cow<'_, OsStr>> {
-    Ok(Cow::Borrowed(OsStrExt::from_bytes(string)))
-}
-
-pub(super) fn os_str_to_bytes(os_string: &OsStr) -> Cow<'_, [u8]> {
-    Cow::Borrowed(OsStrExt::as_bytes(os_string))
-}
-
-pub(super) fn os_string_from_vec(string: Vec<u8>) -> Result<OsString> {
-    Ok(OsStringExt::from_vec(string))
-}
-
-pub(super) fn os_string_into_vec(os_string: OsString) -> Vec<u8> {
-    OsStringExt::into_vec(os_string)
-}
diff --git a/src/lib.rs b/src/lib.rs
@@ -275,7 +275,6 @@ if_conversions! {
     }
 }
 
-#[allow(dead_code)]
 #[cfg_attr(
     all(target_family = "wasm", target_os = "unknown"),
     path = "wasm/mod.rs"
@@ -287,7 +286,11 @@ if_conversions! {
 )]
 mod imp;
 
-#[cfg(any(feature = "raw_os_str", windows))]
+if_conversions! {
+    use imp::convert;
+}
+
+#[cfg(any(all(feature = "conversions", windows), feature = "raw_os_str"))]
 mod util;
 
 if_raw_str! {
@@ -325,7 +328,7 @@ if_checked_conversions! {
         os_str_bytes_docs_rs,
         doc(cfg(feature = "checked_conversions"))
     )]
-    pub struct EncodingError(imp::EncodingError);
+    pub struct EncodingError(convert::EncodingError);
 
     impl Display for EncodingError {
         #[inline]
@@ -342,14 +345,14 @@ if_checked_conversions! {
 }
 
 if_conversions! {
-    fn from_raw_bytes<'a, S>(string: S) -> imp::Result<Cow<'a, OsStr>>
+    fn from_raw_bytes<'a, S>(string: S) -> convert::Result<Cow<'a, OsStr>>
     where
         S: Into<Cow<'a, [u8]>>,
     {
         match string.into() {
-            Cow::Borrowed(string) => imp::os_str_from_bytes(string),
+            Cow::Borrowed(string) => convert::os_str_from_bytes(string),
             Cow::Owned(string) => {
-                imp::os_string_from_vec(string).map(Cow::Owned)
+                convert::os_string_from_vec(string).map(Cow::Owned)
             }
         }
     }
@@ -482,7 +485,7 @@ if_conversions! {
 
         #[inline]
         fn to_raw_bytes(&self) -> Cow<'_, [u8]> {
-            imp::os_str_to_bytes(self)
+            convert::os_str_to_bytes(self)
         }
     }
 
@@ -1055,19 +1058,19 @@ if_conversions! {
     impl OsStringBytes for OsString {
         #[inline]
         fn assert_from_raw_vec(string: Vec<u8>) -> Self {
-            expect_encoded!(imp::os_string_from_vec(string))
+            expect_encoded!(convert::os_string_from_vec(string))
         }
 
         if_checked_conversions! {
             #[inline]
             fn from_raw_vec(string: Vec<u8>) -> Result<Self> {
-                imp::os_string_from_vec(string).map_err(EncodingError)
+                convert::os_string_from_vec(string).map_err(EncodingError)
             }
         }
 
         #[inline]
         fn into_raw_vec(self) -> Vec<u8> {
-            imp::os_string_into_vec(self)
+            convert::os_string_into_vec(self)
         }
     }
 

diff --git a/src/raw_str.rs b/src/raw_str.rs
@@ -37,7 +37,7 @@ if_checked_conversions! {
 }
 
 if_conversions! {
-    use super::imp;
+    use super::convert;
 }
 
 #[cfg(not(feature = "memchr"))]
@@ -181,8 +181,8 @@ impl RawOsStr {
     if_conversions! {
         fn cow_from_raw_bytes_checked(
             string: &[u8],
-        ) -> imp::Result<Cow<'_, Self>> {
-            imp::os_str_from_bytes(string).map(RawOsStrCow::from_os_str)
+        ) -> convert::Result<Cow<'_, Self>> {
+            convert::os_str_from_bytes(string).map(RawOsStrCow::from_os_str)
         }
     }
 
@@ -730,7 +730,7 @@ impl RawOsStr {
         #[inline]
         #[must_use]
         pub fn to_raw_bytes(&self) -> Cow<'_, [u8]> {
-            imp::os_str_to_bytes(self.as_os_str())
+            convert::os_str_to_bytes(self.as_os_str())
         }
     }
 
@@ -1087,8 +1087,8 @@ impl RawOsString {
     }
 
     if_conversions! {
-        fn from_raw_vec_checked(string: Vec<u8>) -> imp::Result<Self> {
-            imp::os_string_from_vec(string).map(Self::new)
+        fn from_raw_vec_checked(string: Vec<u8>) -> convert::Result<Self> {
+            convert::os_string_from_vec(string).map(Self::new)
         }
     }
 
@@ -1271,7 +1271,7 @@ impl RawOsString {
         #[inline]
         #[must_use]
         pub fn into_raw_vec(self) -> Vec<u8> {
-            imp::os_string_into_vec(self.into_os_string())
+            convert::os_string_into_vec(self.into_os_string())
         }
     }
 

diff --git a/src/wasm/convert.rs b/src/wasm/convert.rs
@@ -0,0 +1,54 @@
+use std::borrow::Cow;
+use std::error::Error;
+use std::ffi::OsStr;
+use std::ffi::OsString;
+use std::fmt;
+use std::fmt::Display;
+use std::fmt::Formatter;
+use std::result;
+use std::str;
+use std::str::Utf8Error;
+
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
+pub(crate) struct EncodingError(Utf8Error);
+
+impl Display for EncodingError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "os_str_bytes: {}", self.0)
+    }
+}
+
+impl Error for EncodingError {}
+
+pub(crate) type Result<T> = result::Result<T, EncodingError>;
+
+macro_rules! expect_utf8 {
+    ( $result:expr ) => {
+        $result.expect(
+            "platform string contains invalid UTF-8, which should not be \
+             possible",
+        )
+    };
+}
+
+fn from_bytes(string: &[u8]) -> Result<&str> {
+    str::from_utf8(string).map_err(EncodingError)
+}
+
+pub(crate) fn os_str_from_bytes(string: &[u8]) -> Result<Cow<'_, OsStr>> {
+    from_bytes(string).map(|x| Cow::Borrowed(OsStr::new(x)))
+}
+
+pub(crate) fn os_str_to_bytes(os_string: &OsStr) -> Cow<'_, [u8]> {
+    Cow::Borrowed(expect_utf8!(os_string.to_str()).as_bytes())
+}
+
+pub(crate) fn os_string_from_vec(string: Vec<u8>) -> Result<OsString> {
+    String::from_utf8(string)
+        .map(Into::into)
+        .map_err(|x| EncodingError(x.utf8_error()))
+}
+
+pub(crate) fn os_string_into_vec(os_string: OsString) -> Vec<u8> {
+    expect_utf8!(os_string.into_string()).into_bytes()
+}
diff --git a/src/wasm/mod.rs b/src/wasm/mod.rs
@@ -1,58 +1,7 @@
-use std::borrow::Cow;
-use std::error::Error;
-use std::ffi::OsStr;
-use std::ffi::OsString;
-use std::fmt;
-use std::fmt::Display;
-use std::fmt::Formatter;
-use std::result;
-use std::str;
-use std::str::Utf8Error;
+if_conversions! {
+    pub(super) mod convert;
+}
 
 if_raw_str! {
     pub(super) mod raw;
 }
-
-#[derive(Clone, Copy, Debug, Eq, PartialEq)]
-pub(super) struct EncodingError(Utf8Error);
-
-impl Display for EncodingError {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        write!(f, "os_str_bytes: {}", self.0)
-    }
-}
-
-impl Error for EncodingError {}
-
-pub(super) type Result<T> = result::Result<T, EncodingError>;
-
-macro_rules! expect_utf8 {
-    ( $result:expr ) => {
-        $result.expect(
-            "platform string contains invalid UTF-8, which should not be \
-             possible",
-        )
-    };
-}
-
-fn from_bytes(string: &[u8]) -> Result<&str> {
-    str::from_utf8(string).map_err(EncodingError)
-}
-
-pub(super) fn os_str_from_bytes(string: &[u8]) -> Result<Cow<'_, OsStr>> {
-    from_bytes(string).map(|x| Cow::Borrowed(OsStr::new(x)))
-}
-
-pub(super) fn os_str_to_bytes(os_string: &OsStr) -> Cow<'_, [u8]> {
-    Cow::Borrowed(expect_utf8!(os_string.to_str()).as_bytes())
-}
-
-pub(super) fn os_string_from_vec(string: Vec<u8>) -> Result<OsString> {
-    String::from_utf8(string)
-        .map(Into::into)
-        .map_err(|x| EncodingError(x.utf8_error()))
-}
-
-pub(super) fn os_string_into_vec(os_string: OsString) -> Vec<u8> {
-    expect_utf8!(os_string.into_string()).into_bytes()
-}
diff --git a/src/wasm/raw.rs b/src/wasm/raw.rs
@@ -3,6 +3,7 @@ use std::fmt::Formatter;
 
 use crate::RawOsStr;
 
+#[allow(dead_code)]
 #[path = "../common/raw.rs"]
 mod common_raw;
 #[cfg(feature = "uniquote")]