diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-05-16 02:37:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 02:37:07 +0200 |
| commit | 86f48c53112b357963893bea4b7b80fcd6dedb01 (patch) | |
| tree | 88f2d5c7561e6bb3d8e25ae5dd2f502a8be54516 /src/libstd | |
| parent | ed084b0b8341c974769a0328f61851b0e1fc17fa (diff) | |
| parent | bdfdc71d0f56a592fd888fcd89e6e9c6188b156c (diff) | |
| download | rust-86f48c53112b357963893bea4b7b80fcd6dedb01.tar.gz rust-86f48c53112b357963893bea4b7b80fcd6dedb01.zip | |
Rollup merge of #71662 - glandium:osstring_from_str, r=sfackler
Implement FromStr for OsString
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ffi/os_str.rs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index 4fde3316973..7a05aaf71f2 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -4,6 +4,7 @@ use crate::fmt; use crate::hash::{Hash, Hasher}; use crate::ops; use crate::rc::Rc; +use crate::str::FromStr; use crate::sync::Arc; use crate::sys::os_str::{Buf, Slice}; @@ -1174,6 +1175,15 @@ impl AsInner<Slice> for OsStr { } } +#[stable(feature = "osstring_from_str", since = "1.45.0")] +impl FromStr for OsString { + type Err = core::convert::Infallible; + + fn from_str(s: &str) -> Result<Self, Self::Err> { + Ok(OsString::from(s)) + } +} + #[cfg(test)] mod tests { use super::*; |
