Merge branch 'master' into 'master'

Make sure all tests and benches actually use ralloc as their global allocator

See merge request redox-os/ralloc!63

benches/box.rs

@@ -3,6 +3,9 @@
 extern crate ralloc;
 extern crate test;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 #[bench]
 fn bench_box(b: &mut test::Bencher) {
     b.iter(|| {

benches/mpsc.rs

@@ -3,6 +3,9 @@
 extern crate ralloc;
 extern crate test;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 use std::sync::mpsc;
 use std::thread;
 

benches/sbrk.rs

@@ -5,5 +5,5 @@ extern crate test;
 
 #[bench]
 fn bench_sbrk(b: &mut test::Bencher) {
-    b.iter(|| ralloc::sbrk(200).unwrap());
+    b.iter(|| unsafe { ralloc::sbrk(200) });
 }

benches/vec.rs

@@ -1,5 +1,8 @@
 #![feature(test)]
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 extern crate ralloc;
 extern crate test;
 

benches/vec_box.rs

@@ -1,5 +1,8 @@
 #![feature(test)]
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 extern crate ralloc;
 extern crate test;
 

tests/arc.rs

@@ -3,6 +3,9 @@
 
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 use std::sync::Arc;
 use std::thread;
 

tests/box.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 #[inline(never)]

tests/btreemap.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::collections::BTreeMap;

tests/cross_thread_drop.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::thread;

tests/join.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::thread;

tests/manual.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::ptr;

tests/manual2.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 #[test]

tests/minimal.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 #[test]
 fn minimal() {
     let a = Box::new(1);

tests/mpsc.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::sync::mpsc;

tests/partial_free.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::ptr;

tests/partial_realloc.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::ptr;

tests/realloc.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 #[test]

tests/scaling.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 #[test]

tests/string.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 #[test]

tests/too_many_threads.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 use std::thread;

tests/vec.rs

@@ -1,5 +1,8 @@
 extern crate ralloc;
 
+#[global_allocator]
+static ALLOCATOR: ralloc::Allocator = ralloc::Allocator;
+
 mod util;
 
 #[test]