bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #26160 - alexcrichton:revert-rc-as-ref, r=aturon

Browse source 
This is a revert of PR #26008 which caused the unintended breakage reported in #26096. We may want to add these implementations in the long run, but for now this revert allows us to take some more time to evaluate the impact of such a change (e.g. run it through crater).

Closes #26096
This commit is contained in:
bors 2015-06-12 23:05:06 +00:00
commit c6b1483377
2 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/liballoc/arc.rs
View file

@ -330,15 +330,6 @@ impl<T: ?Sized> Deref for Arc<T> {
} }
} }
#[stable(feature = "rc_arc_as_ref", since = "1.2.0")]
impl<T: ?Sized> AsRef<T> for Arc<T> {
#[inline]
fn as_ref(&self) -> &T {
&self.inner().data
}
}
impl<T: Clone> Arc<T> { impl<T: Clone> Arc<T> {
/// Make a mutable reference from the given `Arc<T>`. /// Make a mutable reference from the given `Arc<T>`.
/// ///

10
src/liballoc/rc.rs
View file

@ -156,7 +156,6 @@ use std::boxed;
use core::cell::Cell; use core::cell::Cell;
use core::clone::Clone; use core::clone::Clone;
use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering}; use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering};
use core::convert::AsRef;
use core::default::Default; use core::default::Default;
use core::fmt; use core::fmt;
use core::hash::{Hasher, Hash}; use core::hash::{Hasher, Hash};
@ -380,15 +379,6 @@ impl<T: ?Sized> Deref for Rc<T> {
} }
} }
#[stable(feature = "rc_arc_as_ref", since = "1.2.0")]
impl<T: ?Sized> AsRef<T> for Rc<T> {
#[inline(always)]
fn as_ref(&self) -> &T {
&self.inner().value
}
}
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<T: ?Sized> Drop for Rc<T> { impl<T: ?Sized> Drop for Rc<T> {
/// Drops the `Rc<T>`. /// Drops the `Rc<T>`.