Skip to content

Commit

Permalink
Auto merge of rust-lang#61620 - SimonSapin:as_cell, r=RalfJung
Browse files Browse the repository at this point in the history
Stabilize Cell::from_mut and as_slice_of_cells

FCP: rust-lang#43038 (comment)
  • Loading branch information
bors committed Jun 8, 2019
2 parents 7f90abe + 2ce9440 commit fb7cca3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
6 changes: 2 additions & 4 deletions src/libcore/cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,6 @@ impl<T: ?Sized> Cell<T> {
/// # Examples
///
/// ```
/// #![feature(as_cell)]
/// use std::cell::Cell;
///
/// let slice: &mut [i32] = &mut [1, 2, 3];
Expand All @@ -504,7 +503,7 @@ impl<T: ?Sized> Cell<T> {
/// assert_eq!(slice_cell.len(), 3);
/// ```
#[inline]
#[unstable(feature = "as_cell", issue="43038")]
#[stable(feature = "as_cell", since = "1.37.0")]
pub fn from_mut(t: &mut T) -> &Cell<T> {
unsafe {
&*(t as *mut T as *const Cell<T>)
Expand Down Expand Up @@ -541,7 +540,6 @@ impl<T> Cell<[T]> {
/// # Examples
///
/// ```
/// #![feature(as_cell)]
/// use std::cell::Cell;
///
/// let slice: &mut [i32] = &mut [1, 2, 3];
Expand All @@ -550,7 +548,7 @@ impl<T> Cell<[T]> {
///
/// assert_eq!(slice_cell.len(), 3);
/// ```
#[unstable(feature = "as_cell", issue="43038")]
#[stable(feature = "as_cell", since = "1.37.0")]
pub fn as_slice_of_cells(&self) -> &[Cell<T>] {
unsafe {
&*(self as *const Cell<[T]> as *const [Cell<T>])
Expand Down
1 change: 0 additions & 1 deletion src/test/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// run-pass
#![feature(as_cell)]

use std::cell::Cell;

Expand Down

0 comments on commit fb7cca3

Please sign in to comment.