nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert Deref

Browse Source
This commit is contained in:
F001 2018-07-17 11:30:17 +08:00
parent 7e1b983579
commit 8812c6bae9
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libcore/cell.rs
View File

@ -200,8 +200,9 @@ use cmp::Ordering;
use fmt::{self, Debug, Display}; use fmt::{self, Debug, Display};
use marker::Unsize; use marker::Unsize;
use mem; use mem;
use ops::{Deref, DerefMut, CoerceUnsized}; use ops::{Deref, DerefMut, CoerceUnsized, Index};
use ptr; use ptr;
use slice::SliceIndex;
/// A mutable memory location. /// A mutable memory location.
/// ///
@ -510,7 +511,7 @@ impl<T: ?Sized> Cell<T> {
/// ///
/// let slice: &mut [i32] = &mut [1, 2, 3]; /// let slice: &mut [i32] = &mut [1, 2, 3];
/// let cell_slice: &Cell<[i32]> = Cell::from_mut(slice); /// let cell_slice: &Cell<[i32]> = Cell::from_mut(slice);
/// assert_eq!(cell_slice.len(), 3); /// assert_eq!(cell_slice[..].len(), 3);
/// ///
/// let slice_cell: &[Cell<i32>] = &cell_slice[..]; /// let slice_cell: &[Cell<i32>] = &cell_slice[..];
/// assert_eq!(slice_cell.len(), 3); /// assert_eq!(slice_cell.len(), 3);
@ -548,23 +549,14 @@ impl<T: Default> Cell<T> {
impl<T: CoerceUnsized<U>, U> CoerceUnsized<Cell<U>> for Cell<T> {} impl<T: CoerceUnsized<U>, U> CoerceUnsized<Cell<U>> for Cell<T> {}
#[unstable(feature = "as_cell", issue="43038")] #[unstable(feature = "as_cell", issue="43038")]
impl<T> Deref for Cell<[T]> { impl<T, I> Index<I> for Cell<[T]>
type Target = [Cell<T>]; where I: SliceIndex<[Cell<T>]>
{
type Output = I::Output;
#[inline] fn index(&self, index: I) -> &Self::Output {
fn deref(&self) -> &[Cell<T>] {
unsafe { unsafe {
&*(self as *const Cell<[T]> as *const [Cell<T>]) Index::index(&*(self as *const Cell<[T]> as *const [Cell<T>]), index)
}
}
}
#[unstable(feature = "as_cell", issue="43038")]
impl<T> DerefMut for Cell<[T]> {
#[inline]
fn deref_mut(&mut self) -> &mut [Cell<T>] {
unsafe {
&mut *(self as *mut Cell<[T]> as *mut [Cell<T>])
} }
} }
} }

2
src/test/run-pass/rfc-1789-as-cell/from-mut.rs
View File

@ -15,7 +15,7 @@ use std::cell::Cell;
fn main() { fn main() {
let slice: &mut [i32] = &mut [1, 2, 3]; let slice: &mut [i32] = &mut [1, 2, 3];
let cell_slice: &Cell<[i32]> = Cell::from_mut(slice); let cell_slice: &Cell<[i32]> = Cell::from_mut(slice);
assert_eq!(cell_slice.len(), 3); assert_eq!(cell_slice[..].len(), 3);
let sub_slice: &[Cell<i32>] = &cell_slice[1..]; let sub_slice: &[Cell<i32>] = &cell_slice[1..];
assert_eq!(sub_slice.len(), 2); assert_eq!(sub_slice.len(), 2);