diff options
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 8 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index a0d60be3000..757c799d85c 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -62,6 +62,11 @@ use core::ops::{Deref, DerefMut}; use core::ptr::{Unique}; use core::raw::{TraitObject}; +#[cfg(not(stage0))] // SNAP c64d671 +use core::marker::Unsize; +#[cfg(not(stage0))] // SNAP c64d671 +use core::ops::CoerceUnsized; + /// A value that represents the heap. This is the default place that the `box` /// keyword allocates into when no place is supplied. /// @@ -390,3 +395,6 @@ impl<'a,A,R> FnOnce<A> for Box<FnBox<A,Output=R>+Send+'a> { self.call_box(args) } } + +#[cfg(not(stage0))] // SNAP c64d671 +impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {} diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 015d0330ed7..a1b5e6e6baf 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -173,9 +173,9 @@ use core::intrinsics::assume; use heap::deallocate; struct RcBox<T> { - value: T, strong: Cell<usize>, - weak: Cell<usize> + weak: Cell<usize>, + value: T } /// A reference-counted pointer type over an immutable value. |
