diff options
| author | bors <bors@rust-lang.org> | 2015-01-29 11:28:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-29 11:28:30 +0000 |
| commit | 3d6f5100aff24aa97275dc92ade728caac605560 (patch) | |
| tree | 46d24003505b7ac308de9b4d4130b73825379b64 /src/liballoc | |
| parent | bedd8108dc9b79402d1ea5349d766275f73398ff (diff) | |
| parent | 092330c6405c275f89fbbbb412e932dd7ed8513d (diff) | |
| download | rust-3d6f5100aff24aa97275dc92ade728caac605560.tar.gz rust-3d6f5100aff24aa97275dc92ade728caac605560.zip | |
Auto merge of #21730 - Manishearth:rollup, r=alexcrichton
Should clear our backlog of rollups from the queue
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index dcbd4d57cf9..1fb6290c7a3 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#[cfg(not(test))] use core::ptr::PtrExt; // FIXME: #13996: mark the `allocate` and `reallocate` return value as `noalias` |