Unify OsString/OsStr for byte-based implementations
diff --git a/src/libstd/sys/cloudabi/mod.rs b/src/libstd/sys/cloudabi/mod.rs
index 47c90fd..3f8e67a 100644
--- a/src/libstd/sys/cloudabi/mod.rs
+++ b/src/libstd/sys/cloudabi/mod.rs
@@ -14,8 +14,6 @@
pub mod memchr;
pub mod mutex;
pub mod os;
-#[path = "../unix/os_str.rs"]
-pub mod os_str;
pub mod rwlock;
pub mod stack_overflow;
pub mod stdio;
@@ -24,6 +22,8 @@
pub mod thread_local;
pub mod time;
+pub use crate::sys_common::os_str_bytes as os_str;
+
mod abi;
mod shims;
diff --git a/src/libstd/sys/redox/ext/ffi.rs b/src/libstd/sys/redox/ext/ffi.rs
index 671498b..974d7b8 100644
--- a/src/libstd/sys/redox/ext/ffi.rs
+++ b/src/libstd/sys/redox/ext/ffi.rs
@@ -1,55 +1,38 @@
//! Redox-specific extension to the primitives in the `std::ffi` module.
+//!
+//! # Examples
+//!
+//! ```
+//! use std::ffi::OsString;
+//! use std::os::redox::ffi::OsStringExt;
+//!
+//! let bytes = b"foo".to_vec();
+//!
+//! // OsStringExt::from_vec
+//! let os_string = OsString::from_vec(bytes);
+//! assert_eq!(os_string.to_str(), Some("foo"));
+//!
+//! // OsStringExt::into_vec
+//! let bytes = os_string.into_vec();
+//! assert_eq!(bytes, b"foo");
+//! ```
+//!
+//! ```
+//! use std::ffi::OsStr;
+//! use std::os::redox::ffi::OsStrExt;
+//!
+//! let bytes = b"foo";
+//!
+//! // OsStrExt::from_bytes
+//! let os_str = OsStr::from_bytes(bytes);
+//! assert_eq!(os_str.to_str(), Some("foo"));
+//!
+//! // OsStrExt::as_bytes
+//! let bytes = os_str.as_bytes();
+//! assert_eq!(bytes, b"foo");
+//! ```
#![stable(feature = "rust1", since = "1.0.0")]
-use crate::ffi::{OsStr, OsString};
-use crate::mem;
-use crate::sys::os_str::Buf;
-use crate::sys_common::{FromInner, IntoInner, AsInner};
-
-/// Redox-specific extensions to [`OsString`].
-///
-/// [`OsString`]: ../../../../std/ffi/struct.OsString.html
#[stable(feature = "rust1", since = "1.0.0")]
-pub trait OsStringExt {
- /// Creates an `OsString` from a byte vector.
- #[stable(feature = "rust1", since = "1.0.0")]
- fn from_vec(vec: Vec<u8>) -> Self;
-
- /// Yields the underlying byte vector of this `OsString`.
- #[stable(feature = "rust1", since = "1.0.0")]
- fn into_vec(self) -> Vec<u8>;
-}
-
-#[stable(feature = "rust1", since = "1.0.0")]
-impl OsStringExt for OsString {
- fn from_vec(vec: Vec<u8>) -> OsString {
- FromInner::from_inner(Buf { inner: vec })
- }
- fn into_vec(self) -> Vec<u8> {
- self.into_inner().inner
- }
-}
-
-/// Redox-specific extensions to [`OsStr`].
-///
-/// [`OsStr`]: ../../../../std/ffi/struct.OsStr.html
-#[stable(feature = "rust1", since = "1.0.0")]
-pub trait OsStrExt {
- #[stable(feature = "rust1", since = "1.0.0")]
- fn from_bytes(slice: &[u8]) -> &Self;
-
- /// Gets the underlying byte view of the `OsStr` slice.
- #[stable(feature = "rust1", since = "1.0.0")]
- fn as_bytes(&self) -> &[u8];
-}
-
-#[stable(feature = "rust1", since = "1.0.0")]
-impl OsStrExt for OsStr {
- fn from_bytes(slice: &[u8]) -> &OsStr {
- unsafe { mem::transmute(slice) }
- }
- fn as_bytes(&self) -> &[u8] {
- &self.as_inner().inner
- }
-}
+pub use crate::sys_common::os_str_bytes::*;
diff --git a/src/libstd/sys/redox/mod.rs b/src/libstd/sys/redox/mod.rs
index 7f3ac1f..0e8ed8e 100644
--- a/src/libstd/sys/redox/mod.rs
+++ b/src/libstd/sys/redox/mod.rs
@@ -22,7 +22,6 @@
pub mod mutex;
pub mod net;
pub mod os;
-pub mod os_str;
pub mod path;
pub mod pipe;
pub mod process;
@@ -35,6 +34,8 @@
pub mod thread_local;
pub mod time;
+pub use crate::sys_common::os_str_bytes as os_str;
+
#[cfg(not(test))]
pub fn init() {}
diff --git a/src/libstd/sys/sgx/ext/ffi.rs b/src/libstd/sys/sgx/ext/ffi.rs
index ad7ade9..63fc5ff 100644
--- a/src/libstd/sys/sgx/ext/ffi.rs
+++ b/src/libstd/sys/sgx/ext/ffi.rs
@@ -1,109 +1,38 @@
//! SGX-specific extension to the primitives in the `std::ffi` module
+//!
+//! # Examples
+//!
+//! ```
+//! use std::ffi::OsString;
+//! use std::os::fortanix_sgx::ffi::OsStringExt;
+//!
+//! let bytes = b"foo".to_vec();
+//!
+//! // OsStringExt::from_vec
+//! let os_string = OsString::from_vec(bytes);
+//! assert_eq!(os_string.to_str(), Some("foo"));
+//!
+//! // OsStringExt::into_vec
+//! let bytes = os_string.into_vec();
+//! assert_eq!(bytes, b"foo");
+//! ```
+//!
+//! ```
+//! use std::ffi::OsStr;
+//! use std::os::fortanix_sgx::ffi::OsStrExt;
+//!
+//! let bytes = b"foo";
+//!
+//! // OsStrExt::from_bytes
+//! let os_str = OsStr::from_bytes(bytes);
+//! assert_eq!(os_str.to_str(), Some("foo"));
+//!
+//! // OsStrExt::as_bytes
+//! let bytes = os_str.as_bytes();
+//! assert_eq!(bytes, b"foo");
+//! ```
#![unstable(feature = "sgx_platform", issue = "56975")]
-use crate::ffi::{OsStr, OsString};
-use crate::mem;
-use crate::sys::os_str::Buf;
-use crate::sys_common::{FromInner, IntoInner, AsInner};
-
-/// SGX-specific extensions to [`OsString`].
-///
-/// [`OsString`]: ../../../../std/ffi/struct.OsString.html
#[unstable(feature = "sgx_platform", issue = "56975")]
-pub trait OsStringExt {
- /// Creates an [`OsString`] from a byte vector.
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsString;
- /// use std::os::unix::ffi::OsStringExt;
- ///
- /// let bytes = b"foo".to_vec();
- /// let os_string = OsString::from_vec(bytes);
- /// assert_eq!(os_string.to_str(), Some("foo"));
- /// ```
- ///
- /// [`OsString`]: ../../../ffi/struct.OsString.html
- #[unstable(feature = "sgx_platform", issue = "56975")]
- fn from_vec(vec: Vec<u8>) -> Self;
-
- /// Yields the underlying byte vector of this [`OsString`].
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsString;
- /// use std::os::unix::ffi::OsStringExt;
- ///
- /// let mut os_string = OsString::new();
- /// os_string.push("foo");
- /// let bytes = os_string.into_vec();
- /// assert_eq!(bytes, b"foo");
- /// ```
- ///
- /// [`OsString`]: ../../../ffi/struct.OsString.html
- #[unstable(feature = "sgx_platform", issue = "56975")]
- fn into_vec(self) -> Vec<u8>;
-}
-
-#[unstable(feature = "sgx_platform", issue = "56975")]
-impl OsStringExt for OsString {
- fn from_vec(vec: Vec<u8>) -> OsString {
- FromInner::from_inner(Buf { inner: vec })
- }
- fn into_vec(self) -> Vec<u8> {
- self.into_inner().inner
- }
-}
-
-/// SGX-specific extensions to [`OsStr`].
-///
-/// [`OsStr`]: ../../../../std/ffi/struct.OsStr.html
-#[unstable(feature = "sgx_platform", issue = "56975")]
-pub trait OsStrExt {
- #[unstable(feature = "sgx_platform", issue = "56975")]
- /// Creates an [`OsStr`] from a byte slice.
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsStr;
- /// use std::os::unix::ffi::OsStrExt;
- ///
- /// let bytes = b"foo";
- /// let os_str = OsStr::from_bytes(bytes);
- /// assert_eq!(os_str.to_str(), Some("foo"));
- /// ```
- ///
- /// [`OsStr`]: ../../../ffi/struct.OsStr.html
- fn from_bytes(slice: &[u8]) -> &Self;
-
- /// Gets the underlying byte view of the [`OsStr`] slice.
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsStr;
- /// use std::os::unix::ffi::OsStrExt;
- ///
- /// let mut os_str = OsStr::new("foo");
- /// let bytes = os_str.as_bytes();
- /// assert_eq!(bytes, b"foo");
- /// ```
- ///
- /// [`OsStr`]: ../../../ffi/struct.OsStr.html
- #[unstable(feature = "sgx_platform", issue = "56975")]
- fn as_bytes(&self) -> &[u8];
-}
-
-#[unstable(feature = "sgx_platform", issue = "56975")]
-impl OsStrExt for OsStr {
- fn from_bytes(slice: &[u8]) -> &OsStr {
- unsafe { mem::transmute(slice) }
- }
- fn as_bytes(&self) -> &[u8] {
- &self.as_inner().inner
- }
-}
+pub use crate::sys_common::os_str_bytes::*;
diff --git a/src/libstd/sys/sgx/mod.rs b/src/libstd/sys/sgx/mod.rs
index 325df76..dc51a93 100644
--- a/src/libstd/sys/sgx/mod.rs
+++ b/src/libstd/sys/sgx/mod.rs
@@ -25,7 +25,6 @@
pub mod mutex;
pub mod net;
pub mod os;
-pub mod os_str;
pub mod path;
pub mod pipe;
pub mod process;
@@ -36,6 +35,8 @@
pub mod time;
pub mod stdio;
+pub use crate::sys_common::os_str_bytes as os_str;
+
#[cfg(not(test))]
pub fn init() {
}
diff --git a/src/libstd/sys/sgx/os_str.rs b/src/libstd/sys/sgx/os_str.rs
deleted file mode 100644
index 79b4345..0000000
--- a/src/libstd/sys/sgx/os_str.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-/// The underlying OsString/OsStr implementation on Unix systems: just
-/// a `Vec<u8>`/`[u8]`.
-
-use crate::borrow::Cow;
-use crate::fmt;
-use crate::str;
-use crate::mem;
-use crate::rc::Rc;
-use crate::sync::Arc;
-use crate::sys_common::{AsInner, IntoInner};
-use crate::sys_common::bytestring::debug_fmt_bytestring;
-
-use core::str::lossy::Utf8Lossy;
-
-#[derive(Clone, Hash)]
-pub struct Buf {
- pub inner: Vec<u8>
-}
-
-pub struct Slice {
- pub inner: [u8]
-}
-
-impl fmt::Debug for Slice {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- debug_fmt_bytestring(&self.inner, formatter)
- }
-}
-
-impl fmt::Display for Slice {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Display::fmt(&Utf8Lossy::from_bytes(&self.inner), formatter)
- }
-}
-
-impl fmt::Debug for Buf {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Debug::fmt(self.as_slice(), formatter)
- }
-}
-
-impl fmt::Display for Buf {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Display::fmt(self.as_slice(), formatter)
- }
-}
-
-impl IntoInner<Vec<u8>> for Buf {
- fn into_inner(self) -> Vec<u8> {
- self.inner
- }
-}
-
-impl AsInner<[u8]> for Buf {
- fn as_inner(&self) -> &[u8] {
- &self.inner
- }
-}
-
-
-impl Buf {
- pub fn from_string(s: String) -> Buf {
- Buf { inner: s.into_bytes() }
- }
-
- #[inline]
- pub fn with_capacity(capacity: usize) -> Buf {
- Buf {
- inner: Vec::with_capacity(capacity)
- }
- }
-
- #[inline]
- pub fn clear(&mut self) {
- self.inner.clear()
- }
-
- #[inline]
- pub fn capacity(&self) -> usize {
- self.inner.capacity()
- }
-
- #[inline]
- pub fn reserve(&mut self, additional: usize) {
- self.inner.reserve(additional)
- }
-
- #[inline]
- pub fn reserve_exact(&mut self, additional: usize) {
- self.inner.reserve_exact(additional)
- }
-
- #[inline]
- pub fn shrink_to_fit(&mut self) {
- self.inner.shrink_to_fit()
- }
-
- #[inline]
- pub fn shrink_to(&mut self, min_capacity: usize) {
- self.inner.shrink_to(min_capacity)
- }
-
- pub fn as_slice(&self) -> &Slice {
- unsafe { mem::transmute(&*self.inner) }
- }
-
- pub fn into_string(self) -> Result<String, Buf> {
- String::from_utf8(self.inner).map_err(|p| Buf { inner: p.into_bytes() } )
- }
-
- pub fn push_slice(&mut self, s: &Slice) {
- self.inner.extend_from_slice(&s.inner)
- }
-
- #[inline]
- pub fn into_box(self) -> Box<Slice> {
- unsafe { mem::transmute(self.inner.into_boxed_slice()) }
- }
-
- #[inline]
- pub fn from_box(boxed: Box<Slice>) -> Buf {
- let inner: Box<[u8]> = unsafe { mem::transmute(boxed) };
- Buf { inner: inner.into_vec() }
- }
-
- #[inline]
- pub fn into_arc(&self) -> Arc<Slice> {
- self.as_slice().into_arc()
- }
-
- #[inline]
- pub fn into_rc(&self) -> Rc<Slice> {
- self.as_slice().into_rc()
- }
-}
-
-impl Slice {
- fn from_u8_slice(s: &[u8]) -> &Slice {
- unsafe { mem::transmute(s) }
- }
-
- pub fn from_str(s: &str) -> &Slice {
- Slice::from_u8_slice(s.as_bytes())
- }
-
- pub fn to_str(&self) -> Option<&str> {
- str::from_utf8(&self.inner).ok()
- }
-
- pub fn to_string_lossy(&self) -> Cow<str> {
- String::from_utf8_lossy(&self.inner)
- }
-
- pub fn to_owned(&self) -> Buf {
- Buf { inner: self.inner.to_vec() }
- }
-
- #[inline]
- pub fn into_box(&self) -> Box<Slice> {
- let boxed: Box<[u8]> = self.inner.into();
- unsafe { mem::transmute(boxed) }
- }
-
- pub fn empty_box() -> Box<Slice> {
- let boxed: Box<[u8]> = Default::default();
- unsafe { mem::transmute(boxed) }
- }
-
- #[inline]
- pub fn into_arc(&self) -> Arc<Slice> {
- let arc: Arc<[u8]> = Arc::from(&self.inner);
- unsafe { Arc::from_raw(Arc::into_raw(arc) as *const Slice) }
- }
-
- #[inline]
- pub fn into_rc(&self) -> Rc<Slice> {
- let rc: Rc<[u8]> = Rc::from(&self.inner);
- unsafe { Rc::from_raw(Rc::into_raw(rc) as *const Slice) }
- }
-}
diff --git a/src/libstd/sys/unix/ext/ffi.rs b/src/libstd/sys/unix/ext/ffi.rs
index 0c02323..76b34a6 100644
--- a/src/libstd/sys/unix/ext/ffi.rs
+++ b/src/libstd/sys/unix/ext/ffi.rs
@@ -1,109 +1,38 @@
//! Unix-specific extension to the primitives in the `std::ffi` module
+//!
+//! # Examples
+//!
+//! ```
+//! use std::ffi::OsString;
+//! use std::os::unix::ffi::OsStringExt;
+//!
+//! let bytes = b"foo".to_vec();
+//!
+//! // OsStringExt::from_vec
+//! let os_string = OsString::from_vec(bytes);
+//! assert_eq!(os_string.to_str(), Some("foo"));
+//!
+//! // OsStringExt::into_vec
+//! let bytes = os_string.into_vec();
+//! assert_eq!(bytes, b"foo");
+//! ```
+//!
+//! ```
+//! use std::ffi::OsStr;
+//! use std::os::unix::ffi::OsStrExt;
+//!
+//! let bytes = b"foo";
+//!
+//! // OsStrExt::from_bytes
+//! let os_str = OsStr::from_bytes(bytes);
+//! assert_eq!(os_str.to_str(), Some("foo"));
+//!
+//! // OsStrExt::as_bytes
+//! let bytes = os_str.as_bytes();
+//! assert_eq!(bytes, b"foo");
+//! ```
#![stable(feature = "rust1", since = "1.0.0")]
-use crate::ffi::{OsStr, OsString};
-use crate::mem;
-use crate::sys::os_str::Buf;
-use crate::sys_common::{FromInner, IntoInner, AsInner};
-
-/// Unix-specific extensions to [`OsString`].
-///
-/// [`OsString`]: ../../../../std/ffi/struct.OsString.html
#[stable(feature = "rust1", since = "1.0.0")]
-pub trait OsStringExt {
- /// Creates an [`OsString`] from a byte vector.
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsString;
- /// use std::os::unix::ffi::OsStringExt;
- ///
- /// let bytes = b"foo".to_vec();
- /// let os_string = OsString::from_vec(bytes);
- /// assert_eq!(os_string.to_str(), Some("foo"));
- /// ```
- ///
- /// [`OsString`]: ../../../ffi/struct.OsString.html
- #[stable(feature = "rust1", since = "1.0.0")]
- fn from_vec(vec: Vec<u8>) -> Self;
-
- /// Yields the underlying byte vector of this [`OsString`].
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsString;
- /// use std::os::unix::ffi::OsStringExt;
- ///
- /// let mut os_string = OsString::new();
- /// os_string.push("foo");
- /// let bytes = os_string.into_vec();
- /// assert_eq!(bytes, b"foo");
- /// ```
- ///
- /// [`OsString`]: ../../../ffi/struct.OsString.html
- #[stable(feature = "rust1", since = "1.0.0")]
- fn into_vec(self) -> Vec<u8>;
-}
-
-#[stable(feature = "rust1", since = "1.0.0")]
-impl OsStringExt for OsString {
- fn from_vec(vec: Vec<u8>) -> OsString {
- FromInner::from_inner(Buf { inner: vec })
- }
- fn into_vec(self) -> Vec<u8> {
- self.into_inner().inner
- }
-}
-
-/// Unix-specific extensions to [`OsStr`].
-///
-/// [`OsStr`]: ../../../../std/ffi/struct.OsStr.html
-#[stable(feature = "rust1", since = "1.0.0")]
-pub trait OsStrExt {
- #[stable(feature = "rust1", since = "1.0.0")]
- /// Creates an [`OsStr`] from a byte slice.
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsStr;
- /// use std::os::unix::ffi::OsStrExt;
- ///
- /// let bytes = b"foo";
- /// let os_str = OsStr::from_bytes(bytes);
- /// assert_eq!(os_str.to_str(), Some("foo"));
- /// ```
- ///
- /// [`OsStr`]: ../../../ffi/struct.OsStr.html
- fn from_bytes(slice: &[u8]) -> &Self;
-
- /// Gets the underlying byte view of the [`OsStr`] slice.
- ///
- /// # Examples
- ///
- /// ```
- /// use std::ffi::OsStr;
- /// use std::os::unix::ffi::OsStrExt;
- ///
- /// let mut os_str = OsStr::new("foo");
- /// let bytes = os_str.as_bytes();
- /// assert_eq!(bytes, b"foo");
- /// ```
- ///
- /// [`OsStr`]: ../../../ffi/struct.OsStr.html
- #[stable(feature = "rust1", since = "1.0.0")]
- fn as_bytes(&self) -> &[u8];
-}
-
-#[stable(feature = "rust1", since = "1.0.0")]
-impl OsStrExt for OsStr {
- fn from_bytes(slice: &[u8]) -> &OsStr {
- unsafe { mem::transmute(slice) }
- }
- fn as_bytes(&self) -> &[u8] {
- &self.as_inner().inner
- }
-}
+pub use crate::sys_common::os_str_bytes::*;
diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs
index fbe3444..90e2644 100644
--- a/src/libstd/sys/unix/mod.rs
+++ b/src/libstd/sys/unix/mod.rs
@@ -47,7 +47,6 @@
#[cfg(target_os = "l4re")]
pub use self::l4re::net;
pub mod os;
-pub mod os_str;
pub mod path;
pub mod pipe;
pub mod process;
@@ -59,6 +58,8 @@
pub mod time;
pub mod stdio;
+pub use crate::sys_common::os_str_bytes as os_str;
+
#[cfg(not(test))]
pub fn init() {
// By default, some platforms will send a *signal* when an EPIPE error
diff --git a/src/libstd/sys/unix/os_str.rs b/src/libstd/sys/unix/os_str.rs
deleted file mode 100644
index 79b4345..0000000
--- a/src/libstd/sys/unix/os_str.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-/// The underlying OsString/OsStr implementation on Unix systems: just
-/// a `Vec<u8>`/`[u8]`.
-
-use crate::borrow::Cow;
-use crate::fmt;
-use crate::str;
-use crate::mem;
-use crate::rc::Rc;
-use crate::sync::Arc;
-use crate::sys_common::{AsInner, IntoInner};
-use crate::sys_common::bytestring::debug_fmt_bytestring;
-
-use core::str::lossy::Utf8Lossy;
-
-#[derive(Clone, Hash)]
-pub struct Buf {
- pub inner: Vec<u8>
-}
-
-pub struct Slice {
- pub inner: [u8]
-}
-
-impl fmt::Debug for Slice {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- debug_fmt_bytestring(&self.inner, formatter)
- }
-}
-
-impl fmt::Display for Slice {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Display::fmt(&Utf8Lossy::from_bytes(&self.inner), formatter)
- }
-}
-
-impl fmt::Debug for Buf {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Debug::fmt(self.as_slice(), formatter)
- }
-}
-
-impl fmt::Display for Buf {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Display::fmt(self.as_slice(), formatter)
- }
-}
-
-impl IntoInner<Vec<u8>> for Buf {
- fn into_inner(self) -> Vec<u8> {
- self.inner
- }
-}
-
-impl AsInner<[u8]> for Buf {
- fn as_inner(&self) -> &[u8] {
- &self.inner
- }
-}
-
-
-impl Buf {
- pub fn from_string(s: String) -> Buf {
- Buf { inner: s.into_bytes() }
- }
-
- #[inline]
- pub fn with_capacity(capacity: usize) -> Buf {
- Buf {
- inner: Vec::with_capacity(capacity)
- }
- }
-
- #[inline]
- pub fn clear(&mut self) {
- self.inner.clear()
- }
-
- #[inline]
- pub fn capacity(&self) -> usize {
- self.inner.capacity()
- }
-
- #[inline]
- pub fn reserve(&mut self, additional: usize) {
- self.inner.reserve(additional)
- }
-
- #[inline]
- pub fn reserve_exact(&mut self, additional: usize) {
- self.inner.reserve_exact(additional)
- }
-
- #[inline]
- pub fn shrink_to_fit(&mut self) {
- self.inner.shrink_to_fit()
- }
-
- #[inline]
- pub fn shrink_to(&mut self, min_capacity: usize) {
- self.inner.shrink_to(min_capacity)
- }
-
- pub fn as_slice(&self) -> &Slice {
- unsafe { mem::transmute(&*self.inner) }
- }
-
- pub fn into_string(self) -> Result<String, Buf> {
- String::from_utf8(self.inner).map_err(|p| Buf { inner: p.into_bytes() } )
- }
-
- pub fn push_slice(&mut self, s: &Slice) {
- self.inner.extend_from_slice(&s.inner)
- }
-
- #[inline]
- pub fn into_box(self) -> Box<Slice> {
- unsafe { mem::transmute(self.inner.into_boxed_slice()) }
- }
-
- #[inline]
- pub fn from_box(boxed: Box<Slice>) -> Buf {
- let inner: Box<[u8]> = unsafe { mem::transmute(boxed) };
- Buf { inner: inner.into_vec() }
- }
-
- #[inline]
- pub fn into_arc(&self) -> Arc<Slice> {
- self.as_slice().into_arc()
- }
-
- #[inline]
- pub fn into_rc(&self) -> Rc<Slice> {
- self.as_slice().into_rc()
- }
-}
-
-impl Slice {
- fn from_u8_slice(s: &[u8]) -> &Slice {
- unsafe { mem::transmute(s) }
- }
-
- pub fn from_str(s: &str) -> &Slice {
- Slice::from_u8_slice(s.as_bytes())
- }
-
- pub fn to_str(&self) -> Option<&str> {
- str::from_utf8(&self.inner).ok()
- }
-
- pub fn to_string_lossy(&self) -> Cow<str> {
- String::from_utf8_lossy(&self.inner)
- }
-
- pub fn to_owned(&self) -> Buf {
- Buf { inner: self.inner.to_vec() }
- }
-
- #[inline]
- pub fn into_box(&self) -> Box<Slice> {
- let boxed: Box<[u8]> = self.inner.into();
- unsafe { mem::transmute(boxed) }
- }
-
- pub fn empty_box() -> Box<Slice> {
- let boxed: Box<[u8]> = Default::default();
- unsafe { mem::transmute(boxed) }
- }
-
- #[inline]
- pub fn into_arc(&self) -> Arc<Slice> {
- let arc: Arc<[u8]> = Arc::from(&self.inner);
- unsafe { Arc::from_raw(Arc::into_raw(arc) as *const Slice) }
- }
-
- #[inline]
- pub fn into_rc(&self) -> Rc<Slice> {
- let rc: Rc<[u8]> = Rc::from(&self.inner);
- unsafe { Rc::from_raw(Rc::into_raw(rc) as *const Slice) }
- }
-}
diff --git a/src/libstd/sys/wasm/mod.rs b/src/libstd/sys/wasm/mod.rs
index 1828cce..670d07d 100644
--- a/src/libstd/sys/wasm/mod.rs
+++ b/src/libstd/sys/wasm/mod.rs
@@ -32,7 +32,6 @@
pub mod memchr;
pub mod net;
pub mod os;
-pub mod os_str;
pub mod path;
pub mod pipe;
pub mod process;
@@ -41,6 +40,8 @@
pub mod time;
pub mod stdio;
+pub use crate::sys_common::os_str_bytes as os_str;
+
cfg_if! {
if #[cfg(target_feature = "atomics")] {
#[path = "condvar_atomics.rs"]
diff --git a/src/libstd/sys/wasm/os_str.rs b/src/libstd/sys/wasm/os_str.rs
deleted file mode 100644
index 79b4345..0000000
--- a/src/libstd/sys/wasm/os_str.rs
+++ /dev/null
@@ -1,180 +0,0 @@
-/// The underlying OsString/OsStr implementation on Unix systems: just
-/// a `Vec<u8>`/`[u8]`.
-
-use crate::borrow::Cow;
-use crate::fmt;
-use crate::str;
-use crate::mem;
-use crate::rc::Rc;
-use crate::sync::Arc;
-use crate::sys_common::{AsInner, IntoInner};
-use crate::sys_common::bytestring::debug_fmt_bytestring;
-
-use core::str::lossy::Utf8Lossy;
-
-#[derive(Clone, Hash)]
-pub struct Buf {
- pub inner: Vec<u8>
-}
-
-pub struct Slice {
- pub inner: [u8]
-}
-
-impl fmt::Debug for Slice {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- debug_fmt_bytestring(&self.inner, formatter)
- }
-}
-
-impl fmt::Display for Slice {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Display::fmt(&Utf8Lossy::from_bytes(&self.inner), formatter)
- }
-}
-
-impl fmt::Debug for Buf {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Debug::fmt(self.as_slice(), formatter)
- }
-}
-
-impl fmt::Display for Buf {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
- fmt::Display::fmt(self.as_slice(), formatter)
- }
-}
-
-impl IntoInner<Vec<u8>> for Buf {
- fn into_inner(self) -> Vec<u8> {
- self.inner
- }
-}
-
-impl AsInner<[u8]> for Buf {
- fn as_inner(&self) -> &[u8] {
- &self.inner
- }
-}
-
-
-impl Buf {
- pub fn from_string(s: String) -> Buf {
- Buf { inner: s.into_bytes() }
- }
-
- #[inline]
- pub fn with_capacity(capacity: usize) -> Buf {
- Buf {
- inner: Vec::with_capacity(capacity)
- }
- }
-
- #[inline]
- pub fn clear(&mut self) {
- self.inner.clear()
- }
-
- #[inline]
- pub fn capacity(&self) -> usize {
- self.inner.capacity()
- }
-
- #[inline]
- pub fn reserve(&mut self, additional: usize) {
- self.inner.reserve(additional)
- }
-
- #[inline]
- pub fn reserve_exact(&mut self, additional: usize) {
- self.inner.reserve_exact(additional)
- }
-
- #[inline]
- pub fn shrink_to_fit(&mut self) {
- self.inner.shrink_to_fit()
- }
-
- #[inline]
- pub fn shrink_to(&mut self, min_capacity: usize) {
- self.inner.shrink_to(min_capacity)
- }
-
- pub fn as_slice(&self) -> &Slice {
- unsafe { mem::transmute(&*self.inner) }
- }
-
- pub fn into_string(self) -> Result<String, Buf> {
- String::from_utf8(self.inner).map_err(|p| Buf { inner: p.into_bytes() } )
- }
-
- pub fn push_slice(&mut self, s: &Slice) {
- self.inner.extend_from_slice(&s.inner)
- }
-
- #[inline]
- pub fn into_box(self) -> Box<Slice> {
- unsafe { mem::transmute(self.inner.into_boxed_slice()) }
- }
-
- #[inline]
- pub fn from_box(boxed: Box<Slice>) -> Buf {
- let inner: Box<[u8]> = unsafe { mem::transmute(boxed) };
- Buf { inner: inner.into_vec() }
- }
-
- #[inline]
- pub fn into_arc(&self) -> Arc<Slice> {
- self.as_slice().into_arc()
- }
-
- #[inline]
- pub fn into_rc(&self) -> Rc<Slice> {
- self.as_slice().into_rc()
- }
-}
-
-impl Slice {
- fn from_u8_slice(s: &[u8]) -> &Slice {
- unsafe { mem::transmute(s) }
- }
-
- pub fn from_str(s: &str) -> &Slice {
- Slice::from_u8_slice(s.as_bytes())
- }
-
- pub fn to_str(&self) -> Option<&str> {
- str::from_utf8(&self.inner).ok()
- }
-
- pub fn to_string_lossy(&self) -> Cow<str> {
- String::from_utf8_lossy(&self.inner)
- }
-
- pub fn to_owned(&self) -> Buf {
- Buf { inner: self.inner.to_vec() }
- }
-
- #[inline]
- pub fn into_box(&self) -> Box<Slice> {
- let boxed: Box<[u8]> = self.inner.into();
- unsafe { mem::transmute(boxed) }
- }
-
- pub fn empty_box() -> Box<Slice> {
- let boxed: Box<[u8]> = Default::default();
- unsafe { mem::transmute(boxed) }
- }
-
- #[inline]
- pub fn into_arc(&self) -> Arc<Slice> {
- let arc: Arc<[u8]> = Arc::from(&self.inner);
- unsafe { Arc::from_raw(Arc::into_raw(arc) as *const Slice) }
- }
-
- #[inline]
- pub fn into_rc(&self) -> Rc<Slice> {
- let rc: Rc<[u8]> = Rc::from(&self.inner);
- unsafe { Rc::from_raw(Rc::into_raw(rc) as *const Slice) }
- }
-}
diff --git a/src/libstd/sys_common/mod.rs b/src/libstd/sys_common/mod.rs
index 1fc3236..883ab34 100644
--- a/src/libstd/sys_common/mod.rs
+++ b/src/libstd/sys_common/mod.rs
@@ -35,6 +35,13 @@
pub mod condvar;
pub mod io;
pub mod mutex;
+#[cfg(any(rustdoc, // see `mod os`, docs are generated for multiple platforms
+ unix,
+ target_os = "redox",
+ target_os = "cloudabi",
+ target_arch = "wasm32",
+ all(target_vendor = "fortanix", target_env = "sgx")))]
+pub mod os_str_bytes;
pub mod poison;
pub mod remutex;
pub mod rwlock;
diff --git a/src/libstd/sys/redox/os_str.rs b/src/libstd/sys_common/os_str_bytes.rs
similarity index 64%
rename from src/libstd/sys/redox/os_str.rs
rename to src/libstd/sys_common/os_str_bytes.rs
index 79b4345..5a9235a 100644
--- a/src/libstd/sys/redox/os_str.rs
+++ b/src/libstd/sys_common/os_str_bytes.rs
@@ -1,23 +1,24 @@
-/// The underlying OsString/OsStr implementation on Unix systems: just
-/// a `Vec<u8>`/`[u8]`.
+//! The underlying OsString/OsStr implementation on Unix and many other
+//! systems: just a `Vec<u8>`/`[u8]`.
use crate::borrow::Cow;
+use crate::ffi::{OsStr, OsString};
use crate::fmt;
use crate::str;
use crate::mem;
use crate::rc::Rc;
use crate::sync::Arc;
-use crate::sys_common::{AsInner, IntoInner};
+use crate::sys_common::{FromInner, IntoInner, AsInner};
use crate::sys_common::bytestring::debug_fmt_bytestring;
use core::str::lossy::Utf8Lossy;
#[derive(Clone, Hash)]
-pub struct Buf {
+pub(crate) struct Buf {
pub inner: Vec<u8>
}
-pub struct Slice {
+pub(crate) struct Slice {
pub inner: [u8]
}
@@ -178,3 +179,67 @@
unsafe { Rc::from_raw(Rc::into_raw(rc) as *const Slice) }
}
}
+
+/// Platform-specific extensions to [`OsString`].
+///
+/// [`OsString`]: ../../../../std/ffi/struct.OsString.html
+#[stable(feature = "rust1", since = "1.0.0")]
+pub trait OsStringExt {
+ /// Creates an [`OsString`] from a byte vector.
+ ///
+ /// See the module docmentation for an example.
+ ///
+ /// [`OsString`]: ../../../ffi/struct.OsString.html
+ #[stable(feature = "rust1", since = "1.0.0")]
+ fn from_vec(vec: Vec<u8>) -> Self;
+
+ /// Yields the underlying byte vector of this [`OsString`].
+ ///
+ /// See the module docmentation for an example.
+ ///
+ /// [`OsString`]: ../../../ffi/struct.OsString.html
+ #[stable(feature = "rust1", since = "1.0.0")]
+ fn into_vec(self) -> Vec<u8>;
+}
+
+#[stable(feature = "rust1", since = "1.0.0")]
+impl OsStringExt for OsString {
+ fn from_vec(vec: Vec<u8>) -> OsString {
+ FromInner::from_inner(Buf { inner: vec })
+ }
+ fn into_vec(self) -> Vec<u8> {
+ self.into_inner().inner
+ }
+}
+
+/// Platform-specific extensions to [`OsStr`].
+///
+/// [`OsStr`]: ../../../../std/ffi/struct.OsStr.html
+#[stable(feature = "rust1", since = "1.0.0")]
+pub trait OsStrExt {
+ #[stable(feature = "rust1", since = "1.0.0")]
+ /// Creates an [`OsStr`] from a byte slice.
+ ///
+ /// See the module docmentation for an example.
+ ///
+ /// [`OsStr`]: ../../../ffi/struct.OsStr.html
+ fn from_bytes(slice: &[u8]) -> &Self;
+
+ /// Gets the underlying byte view of the [`OsStr`] slice.
+ ///
+ /// See the module docmentation for an example.
+ ///
+ /// [`OsStr`]: ../../../ffi/struct.OsStr.html
+ #[stable(feature = "rust1", since = "1.0.0")]
+ fn as_bytes(&self) -> &[u8];
+}
+
+#[stable(feature = "rust1", since = "1.0.0")]
+impl OsStrExt for OsStr {
+ fn from_bytes(slice: &[u8]) -> &OsStr {
+ unsafe { mem::transmute(slice) }
+ }
+ fn as_bytes(&self) -> &[u8] {
+ &self.as_inner().inner
+ }
+}
