Add IO conversion methods

src/common/convert.rs

@@ -4,21 +4,8 @@ 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;
+use super::os::ffi::OsStrExt;
+use super::os::ffi::OsStringExt;
 
 pub(crate) type EncodingError = Infallible;
 

src/common/convert_io.rs

@@ -0,0 +1,30 @@
+use std::borrow::Cow;
+use std::ffi::OsStr;
+use std::ffi::OsString;
+
+use super::os::ffi::OsStrExt;
+use super::os::ffi::OsStringExt;
+
+pub(crate) fn os_str_from_bytes(string: &[u8]) -> Option<&OsStr> {
+    Some(OsStr::from_bytes(string))
+}
+
+pub(crate) fn os_str_to_bytes(string: &OsStr) -> Option<&'_ [u8]> {
+    Some(string.as_bytes())
+}
+
+pub(crate) fn os_str_to_bytes_lossy(string: &OsStr) -> Cow<'_, [u8]> {
+    Cow::Borrowed(string.as_bytes())
+}
+
+pub(crate) fn os_string_from_vec(string: Vec<u8>) -> Option<OsString> {
+    Some(OsString::from_vec(string))
+}
+
+pub(crate) fn os_string_into_vec(string: OsString) -> Option<Vec<u8>> {
+    Some(string.into_vec())
+}
+
+pub(crate) fn os_string_into_vec_lossy(string: OsString) -> Vec<u8> {
+    string.into_vec()
+}

src/common/mod.rs

@@ -1,3 +1,18 @@
+#[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;
+
+pub(super) mod convert_io;
+
 if_conversions! {
     pub(super) mod convert;
 

src/ext.rs

@@ -13,16 +13,13 @@ use super::iter::Utf8Chunks;
 use super::pattern::Encoded as EncodedPattern;
 use super::util;
 use super::util::MAX_UTF8_LENGTH;
+use super::OsStrBytes;
 use super::Pattern;
 
 if_conversions! {
     use super::imp::raw;
-    use super::OsStrBytes;
 }
 
-#[cfg(not(feature = "conversions"))]
-use super::private;
-
 fn is_boundary(string: &OsStr, index: usize) -> bool {
     let string = string.as_encoded_bytes();
     debug_assert!(index < string.len());
@@ -134,12 +131,6 @@ where
     trim_matches(string, pat, OsStrBytesExt::strip_prefix)
 }
 
-#[cfg(not(feature = "conversions"))]
-trait OsStrBytes: private::Sealed {}
-
-#[cfg(not(feature = "conversions"))]
-impl OsStrBytes for OsStr {}
-
 /// An extension trait providing additional methods to [`OsStr`].
 ///
 /// In most cases, this trait will prevent needing to call