Test fixes and rebase conflicts

2015-01-07 18:53:58 -08:00
parent 11e265c2e0
commit 0dc48b47a8
194 changed files with 386 additions and 309 deletions
--- 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")]