diff options
| author | bors <bors@rust-lang.org> | 2015-07-28 08:51:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-28 08:51:21 +0000 |
| commit | 5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9 (patch) | |
| tree | 5e0ce03e0e08c453eb3c8c8f470553c6cda98263 /src/liballoc | |
| parent | 79d5fefa2508212ec2cc46c1069819a988f23598 (diff) | |
| parent | cc09b1a08cc61dd3f485308adf3a5a252c718861 (diff) | |
| download | rust-5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9.tar.gz rust-5b72fa42d434e92e5fbb9fbd3b0995cc936ddcb9.zip | |
Auto merge of #27309 - eddyb:snapshot-infdef, r=alexcrichton
FreeBSD i386 snapshot is missing, failed tests (possibly spurious). r? @alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 05910a3529d..d5a177d3ee5 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -300,7 +300,7 @@ impl<T: Clone> Clone for Box<T> { /// let y = x.clone(); /// ``` #[inline] - fn clone(&self) -> Box<T> { box (HEAP) {(**self).clone()} } + fn clone(&self) -> Box<T> { box {(**self).clone()} } /// Copies `source`'s contents into `self` without creating a new allocation. /// /// # Examples diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index f66495c4057..fce327398e3 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -70,8 +70,6 @@ test(no_crate_inject))] #![no_std] -// SNAP d4432b3 -#![allow(unused_features)] // until feature(placement_in_syntax) is in snap #![feature(allocator)] #![feature(box_syntax)] #![feature(coerce_unsized)] |