diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-18 17:05:15 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-18 17:23:03 -0700 |
| commit | 2c3bf8836f6f0cd18d8ac4f7189615f7f4098f5d (patch) | |
| tree | 1c5ad3accee66577da0f3e33c4ca1be1f4b698c9 /src/liballoc | |
| parent | 72f0d4535715505c1cc429ef277a954ba26366bd (diff) | |
| download | rust-2c3bf8836f6f0cd18d8ac4f7189615f7f4098f5d.tar.gz rust-2c3bf8836f6f0cd18d8ac4f7189615f7f4098f5d.zip | |
Merge conflicts from the rollup
Closes #14480 (vim: Add :RustRun and associated commands) Closes #14917 (Deprecate free-standing endian conversions in favor of methods on Int. Merge Bitwise into Int and add more bit operations.) Closes #14981 (librustc: Use expr_ty_adjusted in trans_overloaded_call.) Closes #14989 (std::task - Revamp TaskBuilder API) Closes #14997 (Reject double moves out of array elements) Closes #14998 (Vim: highlight escapes for byte literals.) Closes #15002 (Fix FIXME #5275) Closes #15004 (Fix #14865) Closes #15007 (debuginfo: Add test case for issue #14411.) Closes #15012 ((doc) Change search placeholder text.) Closes #15013 (Update compiler-rt.) Closes #15017 (Deprecate the bytes!() macro.)
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/heap.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs index 79a616b9555..b4d0057778a 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -132,7 +132,7 @@ unsafe fn closure_exchange_malloc(drop_glue: fn(*mut u8), size: uint, mod imp { use core::option::{None, Option}; use core::ptr::{RawPtr, mut_null, null}; - use core::num::Bitwise; + use core::num::Int; use libc::{c_char, c_int, c_void, size_t}; #[link(name = "jemalloc", kind = "static")] |