rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Replace unnecessary uses of TraitObject with casts

Browse Source
This commit is contained in:
Andrew Paseltiner
2016-08-25 20:56:47 -04:00
parent eaf71f8d10
commit 2b10df7f24
4 changed files with 9 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libstd/error.rs
View File

@@ -54,7 +54,6 @@ use fmt::{self, Debug, Display};
use marker::Reflect;
use mem::transmute;
use num;
use raw::TraitObject;
use str;
use string;
@@ -326,11 +325,7 @@ impl Error + 'static {
pub fn downcast_ref<T: Error + 'static>(&self) -> Option<&T> {
if self.is::<T>() {
unsafe {
// Get the raw representation of the trait object
let to: TraitObject = transmute(self);
// Extract the data pointer
Some(&*(to.data as *const T))
Some(&*(self as *const Error as *const T))
}
} else {
None
@@ -344,11 +339,7 @@ impl Error + 'static {
pub fn downcast_mut<T: Error + 'static>(&mut self) -> Option<&mut T> {
if self.is::<T>() {
unsafe {
// Get the raw representation of the trait object
let to: TraitObject = transmute(self);
// Extract the data pointer
Some(&mut *(to.data as *const T as *mut T))
Some(&mut *(self as *mut Error as *mut T))
}
} else {
None
@@ -409,13 +400,8 @@ impl Error {
pub fn downcast<T: Error + 'static>(self: Box<Self>) -> Result<Box<T>, Box<Error>> {
if self.is::<T>() {
unsafe {
// Get the raw representation of the trait object
let raw = Box::into_raw(self);
let to: TraitObject =
transmute::<*mut Error, TraitObject>(raw);
// Extract the data pointer
Ok(Box::from_raw(to.data as *mut T))
let raw: *mut Error = Box::into_raw(self);
Ok(Box::from_raw(raw as *mut T))
}
} else {
Err(self)