---

yaml
---
r: 60637
b: refs/heads/auto
c: 9200237
h: refs/heads/master
i:
  60635: 59d288e
v: v3

Author: pcwalton

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 14be4c23e46144026efaa1fa0155f6407326747e
+refs/heads/auto: 9200237b4d86cba8f3b222ff8957f79d54ecd0e1
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libfuzzer/ast_match.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
+use std::prelude::*;
 
 use vec;
 

branches/auto/src/libfuzzer/fuzzer.rc

@@ -22,13 +22,13 @@
 
 #[no_std];
 
-extern mod core(name = "std", vers = "0.7-pre");
+extern mod std(name = "std", vers = "0.7-pre");
 extern mod extra(name = "extra", vers = "0.7-pre");
 
 extern mod syntax(vers = "0.7-pre");
 
-use core::prelude::*;
-use core::run;
+use std::prelude::*;
+use std::run;
 
 use syntax::diagnostic;
 use syntax::parse::token::ident_interner;
@@ -698,3 +698,10 @@ pub fn main() {
 
     error!("Fuzzer done");
 }
+
+// For bootstrapping purposes...
+pub mod core {
+    pub use std::cmp;
+    pub use std::sys;
+}
+

branches/auto/src/libfuzzer/ivec_fuzz.rs

@@ -28,7 +28,7 @@ vec_edits is not an iter because iters might go away.
 
 */
 
-use core::prelude::*;
+use std::prelude::*;
 
 use vec::slice;
 use vec::len;

branches/auto/src/libfuzzer/rand_util.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
+use std::prelude::*;
 use extra::rand;
 
 // random uint less than n
@@ -63,7 +63,7 @@ fn weighted_choice<T:copy>(r : rand::rng, v : ~[weighted<T>]) -> T {
             return item;
         }
     }
-    core::unreachable();
+    std::unreachable();
 }
 
 fn weighted_vec<T:copy>(v : ~[weighted<T>]) -> ~[T] {