diff options
| author | Jonathan Reem <jonathan.reem@gmail.com> | 2014-11-22 16:06:21 -0800 |
|---|---|---|
| committer | Jonathan Reem <jonathan.reem@gmail.com> | 2014-11-22 16:06:21 -0800 |
| commit | 1b17eefa4aff87ae393c6d5aff7e90ff7c3c3185 (patch) | |
| tree | b7a247b8ed039d5c83095b8b5f16106a7cb3e7a1 /src/liballoc | |
| parent | 0d0a29061443852cae070b27d51de7cc69bbf293 (diff) | |
| download | rust-1b17eefa4aff87ae393c6d5aff7e90ff7c3c3185.tar.gz rust-1b17eefa4aff87ae393c6d5aff7e90ff7c3c3185.zip | |
Any: use plain transmute instead of transmute_copy for downcasting.
transmute_copy is no longer needed and is just slow.
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 26f8522e1c1..000dda59e3d 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -15,7 +15,6 @@ use core::clone::Clone; use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering}; use core::default::Default; use core::fmt; -use core::intrinsics; use core::kinds::Sized; use core::mem; use core::option::Option; @@ -104,17 +103,14 @@ pub trait BoxAny { } #[stable] -impl BoxAny for Box<Any+'static> { +impl BoxAny for Box<Any> { #[inline] - fn downcast<T: 'static>(self) -> Result<Box<T>, Box<Any+'static>> { + fn downcast<T: 'static>(self) -> Result<Box<T>, Box<Any>> { if self.is::<T>() { unsafe { // Get the raw representation of the trait object let to: TraitObject = - *mem::transmute::<&Box<Any>, &TraitObject>(&self); - - // Prevent destructor on self being run - intrinsics::forget(self); + mem::transmute::<Box<Any>, TraitObject>(self); // Extract the data pointer Ok(mem::transmute(to.data)) |
