milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

io: add not_unwind_safe as PhantomData

This commit is contained in:
Jose Storopoli 2024-07-10 16:10:41 +00:00
parent d218848b36
commit b5180732e6
No known key found for this signature in database
GPG Key ID: BCD6BC0FC1D110A5
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
io/src/error.rs
View File

@ -6,6 +6,10 @@ use core::fmt;
#[derive(Debug)] #[derive(Debug)]
pub struct Error { pub struct Error {
kind: ErrorKind, kind: ErrorKind,
/// Indicates that the `struct` can pretend to own a mutable static reference
/// and an [`UnsafeCell`](core::cell::UnsafeCell), which are not unwind safe.
/// This is so that it does not introduce non-additive cargo features.
_not_unwind_safe: core::marker::PhantomData<(&'static mut (), core::cell::UnsafeCell<()>)>,
#[cfg(feature = "std")] #[cfg(feature = "std")]
error: Option<Box<dyn std::error::Error + Send + Sync + 'static>>, error: Option<Box<dyn std::error::Error + Send + Sync + 'static>>,
@ -20,13 +24,13 @@ impl Error {
where where
E: Into<Box<dyn std::error::Error + Send + Sync + 'static>>, E: Into<Box<dyn std::error::Error + Send + Sync + 'static>>,
{ {
Self { kind, error: Some(error.into()) } Self { kind, _not_unwind_safe: core::marker::PhantomData, error: Some(error.into()) }
} }
/// Creates a new I/O error. /// Creates a new I/O error.
#[cfg(all(feature = "alloc", not(feature = "std")))] #[cfg(all(feature = "alloc", not(feature = "std")))]
pub fn new<E: sealed::IntoBoxDynDebug>(kind: ErrorKind, error: E) -> Error { pub fn new<E: sealed::IntoBoxDynDebug>(kind: ErrorKind, error: E) -> Error {
Self { kind, error: Some(error.into()) } Self { kind, _not_unwind_safe: core::marker::PhantomData, error: Some(error.into()) }
} }
/// Returns the error kind for this error. /// Returns the error kind for this error.
@ -49,6 +53,7 @@ impl From<ErrorKind> for Error {
fn from(kind: ErrorKind) -> Error { fn from(kind: ErrorKind) -> Error {
Self { Self {
kind, kind,
_not_unwind_safe: core::marker::PhantomData,
#[cfg(any(feature = "std", feature = "alloc"))] #[cfg(any(feature = "std", feature = "alloc"))]
error: None, error: None,
} }
@ -89,7 +94,11 @@ impl std::error::Error for Error {
#[cfg(feature = "std")] #[cfg(feature = "std")]
impl From<std::io::Error> for Error { impl From<std::io::Error> for Error {
fn from(o: std::io::Error) -> Error { fn from(o: std::io::Error) -> Error {
Self { kind: ErrorKind::from_std(o.kind()), error: o.into_inner() } Self {
kind: ErrorKind::from_std(o.kind()),
_not_unwind_safe: core::marker::PhantomData,
error: o.into_inner(),
}
} }
} }