diff options
| author | bors <bors@rust-lang.org> | 2022-04-15 15:47:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-15 15:47:17 +0000 |
| commit | 1e6fe5855a115ef7f17f3e17205fab7340775701 (patch) | |
| tree | 10d4001f37a7a8f4780f878f9d72f9e60fc9ad73 /library/std/src/error.rs | |
| parent | 69a5ae35fe5bb507ca5987e12392dce5186480b9 (diff) | |
| parent | f62c84e6b9b9720c2a49279843029b1c50fec54e (diff) | |
| download | rust-1e6fe5855a115ef7f17f3e17205fab7340775701.tar.gz rust-1e6fe5855a115ef7f17f3e17205fab7340775701.zip | |
Auto merge of #94079 - petrochenkov:cstr, r=joshtriplett
library: Move `CStr` to libcore, and `CString` to liballoc
Closes https://github.com/rust-lang/rust/issues/46736
Interesting points:
- Stability:
- To make `CStr(ing)` from libcore/liballoc unusable without enabling features I had to make these structures unstable, and reexport them from libstd using stable type aliases instead of `pub use` reexports. (Because stability of `use` items is not checked.)
- Relying on target ABI in libcore is ok:
- https://github.com/rust-lang/rust/pull/94079#issuecomment-1044263371
- `trait CStrExt` (UPDATE: used only in `cfg(bootstrap)` mode, otherwise lang items are used instead)
- https://github.com/rust-lang/rust/pull/94079#issuecomment-1047863450
- `strlen`
- https://github.com/rust-lang/rust/pull/94079#issuecomment-1047863450
Otherwise it's just a code move + some minor hackery usual for liballoc in `cfg(test)` mode.
Diffstat (limited to 'library/std/src/error.rs')
| -rw-r--r-- | library/std/src/error.rs | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/library/std/src/error.rs b/library/std/src/error.rs index 4fb94908c80..3f85c2095cb 100644 --- a/library/std/src/error.rs +++ b/library/std/src/error.rs @@ -26,6 +26,7 @@ use crate::borrow::Cow; use crate::cell; use crate::char; use crate::fmt::{self, Debug, Display, Write}; +use crate::io; use crate::mem::transmute; use crate::num; use crate::str; @@ -612,6 +613,48 @@ impl Error for alloc::collections::TryReserveError {} #[unstable(feature = "duration_checked_float", issue = "83400")] impl Error for time::FromFloatSecsError {} +#[stable(feature = "rust1", since = "1.0.0")] +impl Error for alloc::ffi::NulError { + #[allow(deprecated)] + fn description(&self) -> &str { + "nul byte found in data" + } +} + +#[stable(feature = "rust1", since = "1.0.0")] +impl From<alloc::ffi::NulError> for io::Error { + /// Converts a [`alloc::ffi::NulError`] into a [`io::Error`]. + fn from(_: alloc::ffi::NulError) -> io::Error { + io::const_io_error!(io::ErrorKind::InvalidInput, "data provided contains a nul byte") + } +} + +#[stable(feature = "frombyteswithnulerror_impls", since = "1.17.0")] +impl Error for core::ffi::FromBytesWithNulError { + #[allow(deprecated)] + fn description(&self) -> &str { + self.__description() + } +} + +#[unstable(feature = "cstr_from_bytes_until_nul", issue = "95027")] +impl Error for core::ffi::FromBytesUntilNulError {} + +#[stable(feature = "cstring_from_vec_with_nul", since = "1.58.0")] +impl Error for alloc::ffi::FromVecWithNulError {} + +#[stable(feature = "cstring_into", since = "1.7.0")] +impl Error for alloc::ffi::IntoStringError { + #[allow(deprecated)] + fn description(&self) -> &str { + "C string contained non-utf8 bytes" + } + + fn source(&self) -> Option<&(dyn Error + 'static)> { + Some(self.__source()) + } +} + // Copied from `any.rs`. impl dyn Error + 'static { /// Returns `true` if the inner type is the same as `T`. |
