diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 19:49:22 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 22:04:31 -0800 |
| commit | 47f91a9484eceef10536d4caac6ef578cd254567 (patch) | |
| tree | f966ba8492d954fbff298bc8f9f6be9cda3a2449 /src/liballoc | |
| parent | 665ea963d3c29ef7670662707f2f2307f000efa3 (diff) | |
| download | rust-47f91a9484eceef10536d4caac6ef578cd254567.tar.gz rust-47f91a9484eceef10536d4caac6ef578cd254567.zip | |
Register new snapshots
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 8 | ||||
| -rw-r--r-- | src/liballoc/rc.rs | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 87106041c69..b3c2638f3ae 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -126,11 +126,3 @@ pub fn oom() -> ! { // optimize it out). #[doc(hidden)] pub fn fixme_14344_be_sure_to_link_to_collections() {} - -// NOTE: remove after next snapshot -#[cfg(all(stage0, not(test)))] -#[doc(hidden)] -mod std { - pub use core::fmt; - pub use core::option; -} diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index fb73521af56..f361c36ec8f 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -776,9 +776,7 @@ impl<T> RcBoxPtr<T> for Rc<T> { // the contract anyway. // This allows the null check to be elided in the destructor if we // manipulated the reference count in the same function. - if cfg!(not(stage0)) { // NOTE remove cfg after next snapshot - assume(!self._ptr.is_null()); - } + assume(!self._ptr.is_null()); &(**self._ptr) } } @@ -792,9 +790,7 @@ impl<T> RcBoxPtr<T> for Weak<T> { // the contract anyway. // This allows the null check to be elided in the destructor if we // manipulated the reference count in the same function. - if cfg!(not(stage0)) { // NOTE remove cfg after next snapshot - assume(!self._ptr.is_null()); - } + assume(!self._ptr.is_null()); &(**self._ptr) } } |
