diff --git a/src/error.rs b/src/error.rs index 2a11c30..43b89c6 100644 --- a/src/error.rs +++ b/src/error.rs @@ -83,8 +83,8 @@ impl Error { let vtable = &ErrorVTable { object_drop: object_drop::, object_drop_front: object_drop_front::, - object_raw: object_raw::, - object_mut_raw: object_mut_raw::, + object_ref: object_ref::, + object_mut: object_mut::, object_boxed: object_boxed::, }; let inner = Box::new(ErrorImpl { @@ -356,8 +356,8 @@ impl Drop for Error { struct ErrorVTable { object_drop: unsafe fn(Box>), object_drop_front: unsafe fn(Box>), - object_raw: unsafe fn(&ErrorImpl<()>) -> &(dyn StdError + Send + Sync + 'static), - object_mut_raw: unsafe fn(&mut ErrorImpl<()>) -> &mut (dyn StdError + Send + Sync + 'static), + object_ref: unsafe fn(&ErrorImpl<()>) -> &(dyn StdError + Send + Sync + 'static), + object_mut: unsafe fn(&mut ErrorImpl<()>) -> &mut (dyn StdError + Send + Sync + 'static), object_boxed: unsafe fn(Box>) -> Box, } @@ -376,14 +376,14 @@ unsafe fn object_drop_front(e: Box>) { drop(unerased); } -unsafe fn object_raw(e: &ErrorImpl<()>) -> &(dyn StdError + Send + Sync + 'static) +unsafe fn object_ref(e: &ErrorImpl<()>) -> &(dyn StdError + Send + Sync + 'static) where E: StdError + Send + Sync + 'static, { &(*(e as *const ErrorImpl<()> as *const ErrorImpl))._error } -unsafe fn object_mut_raw(e: &mut ErrorImpl<()>) -> &mut (dyn StdError + Send + Sync + 'static) +unsafe fn object_mut(e: &mut ErrorImpl<()>) -> &mut (dyn StdError + Send + Sync + 'static) where E: StdError + Send + Sync + 'static, { @@ -461,11 +461,11 @@ impl ErrorImpl { impl ErrorImpl<()> { fn error(&self) -> &(dyn StdError + Send + Sync + 'static) { - unsafe { &*(self.vtable.object_raw)(self) } + unsafe { &*(self.vtable.object_ref)(self) } } fn error_mut(&mut self) -> &mut (dyn StdError + Send + Sync + 'static) { - unsafe { &mut *(self.vtable.object_mut_raw)(self) } + unsafe { &mut *(self.vtable.object_mut)(self) } } #[cfg(backtrace)]