-
Notifications
You must be signed in to change notification settings - Fork 12.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move
OsStringExt
and OsStrExt
to std::os
- Loading branch information
Showing
9 changed files
with
85 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
use crate::ffi::{OsStr, OsString}; | ||
use crate::mem; | ||
use crate::sealed::Sealed; | ||
use crate::sys::os_str::Buf; | ||
use crate::sys_common::{AsInner, FromInner, IntoInner}; | ||
|
||
/// Platform-specific extensions to [`OsString`]. | ||
/// | ||
/// This trait is sealed: it cannot be implemented outside the standard library. | ||
/// This is so that future additional methods are not breaking changes. | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub trait OsStringExt: Sealed { | ||
/// Creates an [`OsString`] from a byte vector. | ||
/// | ||
/// See the module documentation for an example. | ||
#[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 documentation for an example. | ||
#[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`]. | ||
/// | ||
/// This trait is sealed: it cannot be implemented outside the standard library. | ||
/// This is so that future additional methods are not breaking changes. | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
pub trait OsStrExt: Sealed { | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
/// Creates an [`OsStr`] from a byte slice. | ||
/// | ||
/// See the module documentation for an example. | ||
fn from_bytes(slice: &[u8]) -> &Self; | ||
|
||
/// Gets the underlying byte view of the [`OsStr`] slice. | ||
/// | ||
/// See the module documentation for an example. | ||
#[stable(feature = "rust1", since = "1.0.0")] | ||
fn as_bytes(&self) -> &[u8]; | ||
} | ||
|
||
#[stable(feature = "rust1", since = "1.0.0")] | ||
impl OsStrExt for OsStr { | ||
#[inline] | ||
fn from_bytes(slice: &[u8]) -> &OsStr { | ||
unsafe { mem::transmute(slice) } | ||
} | ||
#[inline] | ||
fn as_bytes(&self) -> &[u8] { | ||
&self.as_inner().inner | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters