diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 18:53:58 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 19:27:27 -0800 |
| commit | 0dc48b47a8c67eb28e7b89a6c0810dc9446377f7 (patch) | |
| tree | 6ecc7fd6e3031c1d57e85dd6612489903a595b71 /src/liballoc/heap.rs | |
| parent | 11e265c2e0af99a81caf888fc39cc903dc74f1cd (diff) | |
| download | rust-0dc48b47a8c67eb28e7b89a6c0810dc9446377f7.tar.gz rust-0dc48b47a8c67eb28e7b89a6c0810dc9446377f7.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/liballoc/heap.rs')
| -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 439bb6c55dc..02933c763ef 100644 --- a/src/liballoc/heap.rs +++ b/src/liballoc/heap.rs @@ -125,7 +125,7 @@ const MIN_ALIGN: uint = 8; not(feature = "external_crate"), any(target_arch = "x86", target_arch = "x86_64", - target_arch = "aarch64"))] + target_arch = "aarch64")))] const MIN_ALIGN: uint = 16; #[cfg(feature = "external_funcs")] |