From 9200237b4d86cba8f3b222ff8957f79d54ecd0e1 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Mon, 20 May 2013 14:30:00 -0700
Subject: [PATCH] fuzzer: Change `core` to `std` in the fuzzer

---
 src/libfuzzer/ast_match.rs |  2 +-
 src/libfuzzer/fuzzer.rc    | 13 ++++++++++---
 src/libfuzzer/ivec_fuzz.rs |  2 +-
 src/libfuzzer/rand_util.rs |  4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/libfuzzer/ast_match.rs b/src/libfuzzer/ast_match.rs
index 8a22f0a0689..7d623919ff9 100644
--- a/src/libfuzzer/ast_match.rs
+++ b/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;
 
diff --git a/src/libfuzzer/fuzzer.rc b/src/libfuzzer/fuzzer.rc
index c993796639f..3be55937933 100644
--- a/src/libfuzzer/fuzzer.rc
+++ b/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;
+}
+
diff --git a/src/libfuzzer/ivec_fuzz.rs b/src/libfuzzer/ivec_fuzz.rs
index d0f83d4ba54..8f019a14eed 100644
--- a/src/libfuzzer/ivec_fuzz.rs
+++ b/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;
diff --git a/src/libfuzzer/rand_util.rs b/src/libfuzzer/rand_util.rs
index 168c6d4dd61..abc6b1cfc0a 100644
--- a/src/libfuzzer/rand_util.rs
+++ b/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] {