diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-05-12 14:41:08 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-05-13 14:35:53 +1200 |
| commit | 5d4cce6cec7c0975263bbe6f4260167a772bfc89 (patch) | |
| tree | 1dba65dbc1d9332fe808af52bc82951b3f453c8b /src/libcore | |
| parent | db1b14a194cbdbba813aeb4773ee7fa203a40fb1 (diff) | |
| download | rust-5d4cce6cec7c0975263bbe6f4260167a772bfc89.tar.gz rust-5d4cce6cec7c0975263bbe6f4260167a772bfc89.zip | |
Rebasing
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/cell.rs | 1 | ||||
| -rw-r--r-- | src/libcore/ops.rs | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs index bf5fdb973eb..45a80122104 100644 --- a/src/libcore/cell.rs +++ b/src/libcore/cell.rs @@ -707,5 +707,4 @@ impl<T: ?Sized> UnsafeCell<T> { #![allow(trivial_casts)] &self.value as *const T as *mut T } - } diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index 1a2473fda41..9396adc0fe5 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -1220,24 +1220,33 @@ pub trait CoerceUnsized<T> { // Empty. } +// &mut T -> &mut U #[cfg(not(stage0))] // SNAP c64d671 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a mut U> for &'a mut T {} +// &mut T -> &U #[cfg(not(stage0))] // SNAP c64d671 impl<'a, 'b: 'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b mut T {} +// &mut T -> *mut U #[cfg(not(stage0))] // SNAP c64d671 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for &'a mut T {} +// &mut T -> *const U #[cfg(not(stage0))] // SNAP c64d671 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for &'a mut T {} +// &T -> &U #[cfg(not(stage0))] // SNAP c64d671 impl<'a, 'b: 'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<&'a U> for &'b T {} +// &T -> *const U #[cfg(not(stage0))] // SNAP c64d671 impl<'a, T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for &'a T {} +// *mut T -> *mut U #[cfg(not(stage0))] // SNAP c64d671 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*mut U> for *mut T {} +// *mut T -> *const U #[cfg(not(stage0))] // SNAP c64d671 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *mut T {} +// *const T -> *const U #[cfg(not(stage0))] // SNAP c64d671 impl<T: ?Sized+Unsize<U>, U: ?Sized> CoerceUnsized<*const U> for *const T {} |