libextra: Rename the actual metadata names of libcore to libstd and libstd to libextra

Makefile.in

@@ -215,8 +215,8 @@ CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
 CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
 CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
 
-EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
+EXTRALIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),extra)
-STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
+STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
 LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
 LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
 LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)

src/compiletest/common.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 #[deriving(Eq)]
 pub enum mode {
     mode_compile_fail,

src/compiletest/compiletest.rc

@@ -12,11 +12,14 @@
 
 #[allow(non_camel_case_types)];
 
-extern mod std;
+#[no_std];
 
+extern mod core(name = "std", vers = "0.7-pre");
+extern mod std(name = "extra", vers = "0.7-pre");
+
+use core::prelude::*;
 use core::*;
 
-
 use std::getopts;
 use std::test;
 

src/compiletest/errors.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 
 // Load any test directives embedded in the file

src/compiletest/header.rs

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

src/compiletest/procsrv.rs

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

src/compiletest/runtest.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use common::mode_run_pass;
 use common::mode_run_fail;
 use common::mode_compile_fail;

src/compiletest/util.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use common::config;
 
 use core::os::getenv;

src/driver/driver.rs

@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[no_core];
+#[no_std];
+
+extern mod core(name = "std", vers = "0.7-pre");
+
 #[cfg(rustpkg)]
 extern mod this(name = "rustpkg");
 

src/libextra/arc.rs

@@ -37,6 +37,8 @@
  * ~~~
  */
 
+use core::prelude::*;
+
 use sync;
 use sync::{Mutex, mutex_with_condvars, RWlock, rwlock_with_condvars};
 

src/libextra/arena.rs

@@ -32,6 +32,8 @@
 // overhead when initializing plain-old-data and means we don't need
 // to waste time running the destructors of POD.
 
+use core::prelude::*;
+
 use list::{MutList, MutCons, MutNil};
 
 use core::at_vec;

src/libextra/base64.rs

@@ -10,6 +10,12 @@
 
 //! Base64 binary-to-text encoding
 
+use core::prelude::*;
+
+use core::old_iter;
+use core::str;
+use core::vec;
+
 pub trait ToBase64 {
     fn to_base64(&self) -> ~str;
 }

src/libextra/bitv.rs

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

src/libextra/c_vec.rs

@@ -36,6 +36,8 @@
  * still held if needed.
  */
 
+use core::prelude::*;
+
 /**
  * The type representing a foreign chunk of memory
  *

src/libextra/comm.rs

@@ -14,6 +14,8 @@ Higher level communication abstractions.
 
 */
 
+use core::prelude::*;
+
 use core::comm::{GenericChan, GenericSmartChan, GenericPort};
 use core::comm::{Chan, Port, Selectable, Peekable};
 use core::pipes;

src/libextra/deque.rs

@@ -10,6 +10,8 @@
 
 //! A double-ended queue implemented as a circular buffer
 
+use core::prelude::*;
+
 use core::util::replace;
 
 static initial_capacity: uint = 32u; // 2^5

src/libextra/dlist.rs

@@ -18,6 +18,8 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
 
 */
 
+use core::prelude::*;
+
 use core::managed;
 
 pub type DListLink<T> = Option<@mut DListNode<T>>;

src/libextra/ebml.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 // Simple Extensible Binary Markup Language (ebml) reader and writer on a
 // cursor model. See the specification here:
 //     http://www.matroska.org/technical/specs/rfc/index.html
@@ -65,6 +67,8 @@ pub enum EbmlEncoderTag {
 // --------------------------------------
 
 pub mod reader {
+    use core::prelude::*;
+
     use ebml::{Doc, EbmlEncoderTag, EsBool, EsEnum, EsEnumBody, EsEnumVid};
     use ebml::{EsI16, EsI32, EsI64, EsI8, EsInt};
     use ebml::{EsLabel, EsOpaque, EsStr, EsU16, EsU32, EsU64, EsU8, EsUint};

src/libextra/fileinput.rs

@@ -94,6 +94,8 @@ total line count).
     }
 */
 
+use core::prelude::*;
+
 use core::io::ReaderUtil;
 
 /**

src/libextra/flate.rs

@@ -14,9 +14,9 @@ Simple compression
 
 */
 
-use libc;
 use core::libc::{c_void, size_t, c_int};
-use vec;
+use core::libc;
+use core::vec;
 
 #[cfg(test)] use core::rand;
 #[cfg(test)] use core::rand::RngUtil;

src/libextra/flatpipes.rs

@@ -47,6 +47,8 @@ block the scheduler thread, so will their pipes.
 
 */
 
+use core::prelude::*;
+
 // The basic send/recv interface FlatChan and PortChan will implement
 use core::io;
 use core::comm::GenericChan;
@@ -168,6 +170,8 @@ POD are not equivelant.
 
 */
 pub mod pod {
+    use core::prelude::*;
+
     use flatpipes::flatteners::{PodUnflattener, PodFlattener};
     use flatpipes::bytepipes::{ReaderBytePort, WriterByteChan};
     use flatpipes::bytepipes::{PipeBytePort, PipeByteChan};
@@ -331,6 +335,8 @@ pub impl<T,F:Flattener<T>,C:ByteChan> FlatChan<T, F, C> {
 
 
 pub mod flatteners {
+    use core::prelude::*;
+
     use ebml;
     use flatpipes::{Flattener, Unflattener};
     use io_util::BufReader;
@@ -501,6 +507,8 @@ pub mod flatteners {
 }
 
 pub mod bytepipes {
+    use core::prelude::*;
+
     use flatpipes::{ByteChan, BytePort};
 
     use core::io::{Writer, Reader, ReaderUtil};
@@ -628,6 +636,8 @@ pub mod bytepipes {
 
 #[cfg(test)]
 mod test {
+    use core::prelude::*;
+
     use flatpipes::{Flattener, Unflattener};
     use flatpipes::bytepipes::*;
     use flatpipes::pod;

src/libextra/fun_treemap.rs

@@ -19,6 +19,8 @@
  * of features.
  */
 
+use core::prelude::*;
+
 use core::cmp::{Eq, Ord};
 use core::option::{Some, None};
 

src/libextra/future.rs

@@ -23,6 +23,8 @@
  * ~~~
  */
 
+use core::prelude::*;
+
 use core::cast;
 use core::cell::Cell;
 use core::comm::{PortOne, oneshot, send_one, recv_one};

src/libextra/getopts.rs

@@ -78,6 +78,8 @@
  * ```
  */
 
+use core::prelude::*;
+
 use core::cmp::Eq;
 use core::result::{Err, Ok};
 use core::result;

src/libextra/json.rs

@@ -14,6 +14,8 @@
 
 //! json serialization
 
+use core::prelude::*;
+
 use core::io::{WriterUtil, ReaderUtil};
 use core::hashmap::HashMap;
 

src/libextra/list.rs

@@ -10,6 +10,8 @@
 
 //! A standard linked list
 
+use core::prelude::*;
+
 #[deriving(Eq)]
 pub enum List<T> {
     Cons(T, @List<T>),

src/libextra/md4.rs

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

src/libextra/net_ip.rs

@@ -10,6 +10,8 @@
 
 //! Types/fns concerning Internet Protocol (IP), versions 4 & 6
 
+use core::prelude::*;
+
 use core::libc;
 use core::comm::{stream, SharedChan};
 use core::ptr;
@@ -145,6 +147,8 @@ pub fn get_addr(node: &str, iotask: &iotask)
 }
 
 pub mod v4 {
+    use core::prelude::*;
+
     use net::ip::{IpAddr, Ipv4, ParseAddrErr};
     use uv::ll;
     use uv_ip4_addr = uv::ll::ip4_addr;
@@ -246,6 +250,8 @@ pub mod v4 {
     }
 }
 pub mod v6 {
+    use core::prelude::*;
+
     use net::ip::{IpAddr, Ipv6, ParseAddrErr};
     use uv_ip6_addr = uv::ll::ip6_addr;
     use uv_ip6_name = uv::ll::ip6_name;

src/libextra/net_tcp.rs

@@ -11,6 +11,8 @@
 //! High-level interface to libuv's TCP functionality
 // FIXME #4425: Need FFI fixes
 
+use core::prelude::*;
+
 use future;
 use future_spawn = future::spawn;
 use ip = net_ip;

src/libextra/net_url.rs

@@ -10,6 +10,8 @@
 
 //! Types/fns concerning URLs (see RFC 3986)
 
+use core::prelude::*;
+
 use core::cmp::Eq;
 use core::io::{Reader, ReaderUtil};
 use core::io;

src/libextra/num/bigint.rs

@@ -16,6 +16,8 @@ A BigUint is represented as an array of BigDigits.
 A BigInt is a combination of BigUint and Sign.
 */
 
+use core::prelude::*;
+
 use core::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix, Orderable};
 

src/libextra/num/complex.rs

@@ -11,6 +11,8 @@
 
 //! Complex numbers.
 
+use core::prelude::*;
+
 use core::num::{Zero,One,ToStrRadix};
 
 // FIXME #1284: handle complex NaN & infinity etc. This

src/libextra/num/rational.rs

@@ -11,6 +11,8 @@
 
 //! Rational numbers
 
+use core::prelude::*;
+
 use core::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
 use core::from_str::FromStr;
 use super::bigint::BigInt;

src/libextra/par.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use future_spawn = future::spawn;
 
 /**

src/libextra/priority_queue.rs

@@ -10,6 +10,8 @@
 
 //! A priority queue implemented with a binary heap
 
+use core::prelude::*;
+
 use core::old_iter::BaseIter;
 use core::unstable::intrinsics::{move_val_init, init};
 use core::unstable::intrinsics::uninit;

src/libextra/rc.rs

@@ -19,6 +19,8 @@ cycle cannot be created with `Rc<T>` because there is no way to modify it after
 
 */
 
+use core::prelude::*;
+
 use core::libc::{c_void, size_t, malloc, free};
 use core::unstable::intrinsics;
 use core::util;

src/libextra/rl.rs

@@ -11,6 +11,8 @@
 // FIXME #3921. This is unsafe because linenoise uses global mutable
 // state without mutexes.
 
+use core::prelude::*;
+
 use core::libc::{c_char, c_int};
 
 pub mod rustrt {

src/libextra/rope.rs

@@ -33,6 +33,8 @@
  * * access to a character by index is logarithmic (linear in strings);
  */
 
+use core::prelude::*;
+
 /// The type of ropes.
 pub type Rope = node::Root;
 
@@ -439,8 +441,9 @@ pub fn loop_leaves(rope: Rope, it: &fn(node::Leaf) -> bool) -> bool{
 
 pub mod iterator {
     pub mod leaf {
-        use rope::{Rope, node};
+        use core::prelude::*;
 
+        use rope::{Rope, node};
 
         pub fn start(rope: Rope) -> node::leaf_iterator::T {
             match (rope) {
@@ -453,8 +456,9 @@ pub mod iterator {
         }
     }
     pub mod char {
-        use rope::{Rope, node};
+        use core::prelude::*;
 
+        use rope::{Rope, node};
 
         pub fn start(rope: Rope) -> node::char_iterator::T {
             match (rope) {
@@ -548,6 +552,8 @@ pub fn char_at(rope: Rope, pos: uint) -> char {
  Section: Implementation
 */
 pub mod node {
+    use core::prelude::*;
+
     use rope::node;
 
     /// Implementation of type `rope`
@@ -1127,6 +1133,8 @@ pub mod node {
     }
 
     pub mod leaf_iterator {
+        use core::prelude::*;
+
         use rope::node::{Concat, Leaf, Node, height};
 
         pub struct T {
@@ -1166,6 +1174,8 @@ pub mod node {
     }
 
     pub mod char_iterator {
+        use core::prelude::*;
+
         use rope::node::{Leaf, Node};
         use rope::node::leaf_iterator;
 

src/libextra/semver.rs

@@ -10,6 +10,8 @@
 
 //! Semver parsing and logic
 
+use core::prelude::*;
+
 use core::char;
 use core::cmp;
 use core::io::{ReaderUtil};

src/libextra/serialize.rs

@@ -16,6 +16,8 @@ Core encoding and decoding interfaces.
 
 #[forbid(non_camel_case_types)];
 
+use core::prelude::*;
+
 use core::hashmap::{HashMap, HashSet};
 use core::trie::{TrieMap, TrieSet};
 use deque::Deque;

src/libextra/sha1.rs

@@ -22,6 +22,8 @@
  * the `reset` method.
  */
 
+use core::prelude::*;
+
 use core::str;
 use core::uint;
 use core::vec;

src/libextra/smallintmap.rs

@@ -13,6 +13,8 @@
  * are O(highest integer key).
  */
 
+use core::prelude::*;
+
 use core::container::{Container, Mutable, Map, Set};
 use core::old_iter::BaseIter;
 use core::old_iter;

src/libextra/sort.rs

@@ -10,6 +10,8 @@
 
 //! Sorting methods
 
+use core::prelude::*;
+
 use core::cmp::{Eq, Ord};
 use core::vec::len;
 use core::vec;

src/libextra/stats.rs

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

src/libextra/std.rc

@@ -17,7 +17,7 @@ not required in or otherwise suitable for the core library.
 
 */
 
-#[link(name = "std",
+#[link(name = "extra",
        vers = "0.7-pre",
        uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
        url = "https://github.com/mozilla/rust/tree/master/src/libstd")];
@@ -28,6 +28,14 @@ not required in or otherwise suitable for the core library.
 
 #[deny(non_camel_case_types)];
 
+#[no_core];
+#[no_std];
+
+extern mod core(name = "std", vers = "0.7-pre");
+
+use core::{str, unstable};
+use core::str::{StrSlice, OwnedStr};
+
 pub mod uv_ll;
 
 // General io and system-services modules

src/libextra/sync.rs

@@ -15,6 +15,8 @@
  * in std.
  */
 
+use core::prelude::*;
+
 use core::unstable::sync::{Exclusive, exclusive};
 use core::ptr;
 use core::task;

src/libextra/task_pool.rs

@@ -11,6 +11,8 @@
 /// A task pool abstraction. Useful for achieving predictable CPU
 /// parallelism.
 
+use core::prelude::*;
+
 use core::comm::Chan;
 use core::task::SchedMode;
 use core::task;

src/libextra/tempfile.rs

@@ -10,6 +10,8 @@
 
 //! Temporary files and directories
 
+use core::prelude::*;
+
 use core::rand::RngUtil;
 
 pub fn mkdtemp(tmpdir: &Path, suffix: &str) -> Option<Path> {

src/libextra/term.rs

@@ -10,6 +10,8 @@
 
 //! Simple ANSI color library
 
+use core::prelude::*;
+
 use core::io;
 use core::option;
 use core::os;

src/libextra/test.rs

@@ -15,6 +15,8 @@
 // simplest interface possible for representing and running tests
 // while providing a base that other test frameworks may build off of.
 
+use core::prelude::*;
+
 use getopts;
 use sort;
 use term;
@@ -597,6 +599,8 @@ fn calc_result(desc: &TestDesc, task_succeeded: bool) -> TestResult {
 }
 
 pub mod bench {
+    use core::prelude::*;
+
     use time::precise_time_ns;
     use test::{BenchHarness, BenchSamples};
     use stats::Stats;

src/libextra/time.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 static NSEC_PER_SEC: i32 = 1_000_000_000_i32;
 
 pub mod rustrt {

src/libextra/timer.rs

@@ -10,6 +10,8 @@
 
 //! Utilities that leverage libuv's `uv_timer_*` API
 
+use core::prelude::*;
+
 use uv;
 use uv::iotask;
 use uv::iotask::IoTask;

src/libextra/treemap.rs

@@ -12,6 +12,8 @@
 //! trees. The only requirement for the types is that the key implements
 //! `TotalOrd`.
 
+use core::prelude::*;
+
 use core::iterator::*;
 use core::util::{swap, replace};
 

src/libextra/uv_global_loop.rs

@@ -10,6 +10,8 @@
 
 //! A process-wide libuv event loop for library use.
 
+use core::prelude::*;
+
 use iotask = uv_iotask;
 use uv_iotask::{IoTask, spawn_iotask};
 

src/libextra/uv_iotask.rs

@@ -15,6 +15,8 @@
  * `interact` function you can execute code in a uv callback.
  */
 
+use core::prelude::*;
+
 use ll = uv_ll;
 
 use core::comm::{stream, Port, Chan, SharedChan};

src/libextra/uv_ll.rs

@@ -32,6 +32,8 @@
 
 #[allow(non_camel_case_types)]; // C types
 
+use core::prelude::*;
+
 use core::libc::size_t;
 use core::libc::c_void;
 use core::ptr::to_unsafe_ptr;

src/libextra/workcache.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use json;
 use sha1;
 use serialize::{Encoder, Encodable, Decoder, Decodable};

src/libfuzzer/ast_match.rs

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

src/libfuzzer/cycles.rs

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

src/libfuzzer/fuzzer.rc

@@ -20,9 +20,14 @@
 
 #[allow(non_camel_case_types)];
 
-extern mod std;
+#[no_std];
-extern mod syntax;
 
+extern mod core(name = "std", vers = "0.7-pre");
+extern mod std(name = "extra", vers = "0.7-pre");
+
+extern mod syntax(vers = "0.7-pre");
+
+use core::prelude::*;
 use core::run;
 
 use syntax::diagnostic;

src/libfuzzer/ivec_fuzz.rs

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

src/libfuzzer/rand_util.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+use core::prelude::*;
 use std::rand;
 
 // random uint less than n

src/librust/rust.rc

@@ -20,11 +20,17 @@
 #[license = "MIT/ASL2"];
 #[crate_type = "lib"];
 
+#[no_std];
+
+extern mod core(name = "std");
+
 extern mod rustpkg;
 extern mod rustdoc;
 extern mod rusti;
 extern mod rustc;
 
+use core::prelude::*;
+
 use core::run;
 
 enum ValidUsage {

src/librustc/back/link.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use back::rpath;
 use driver::session::Session;
 use driver::session;
@@ -90,6 +92,8 @@ pub fn WriteOutputFile(sess: Session,
 }
 
 pub mod jit {
+    use core::prelude::*;
+
     use back::link::llvm_err;
     use driver::session::Session;
     use lib::llvm::llvm;
@@ -166,6 +170,8 @@ pub mod jit {
 }
 
 pub mod write {
+    use core::prelude::*;
+
     use back::link::jit;
     use back::link::{WriteOutputFile, output_type};
     use back::link::{output_type_assembly, output_type_bitcode};

src/librustc/back/rpath.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use driver::session;
 use metadata::cstore;
 use metadata::filesearch;

src/librustc/driver/driver.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use back::link;
 use back::{arm, x86, x86_64, mips};
 use driver::session::{Aggressive};

src/librustc/driver/session.rs

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

src/librustc/front/config.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use syntax::{ast, fold, attr};
 
 type in_cfg_pred = @fn(attrs: ~[ast::attribute]) -> bool;

src/librustc/front/intrinsic_inject.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use driver::session::Session;
 use syntax::parse;
 use syntax::ast;

src/librustc/front/std_inject.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use driver::session::Session;
 
 use syntax::ast;

src/librustc/front/test.rs

@@ -10,6 +10,8 @@
 
 // Code that generates a test runner to run all the tests in a crate
 
+use core::prelude::*;
+
 use driver::session;
 use front::config;
 

src/librustc/lib/llvm.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use core::hashmap::HashMap;
 use core::libc::{c_uint, c_ushort};
 

src/librustc/metadata/creader.rs

@@ -8,9 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 //! Validates all used crates and extern libraries and loads their metadata
 
+use core::prelude::*;
+
 use metadata::cstore;
 use metadata::decoder;
 use metadata::filesearch::FileSearch;

src/librustc/metadata/csearch.rs

@@ -10,6 +10,8 @@
 
 // Searching for information from the cstore
 
+use core::prelude::*;
+
 use metadata::common::*;
 use metadata::cstore;
 use metadata::decoder;

src/librustc/metadata/cstore.rs

@@ -12,6 +12,8 @@
 // The crate store - a central repo for information collected about external
 // crates and libraries
 
+use core::prelude::*;
+
 use metadata::cstore;
 use metadata::decoder;
 

src/librustc/metadata/decoder.rs

@@ -10,6 +10,8 @@
 
 // Decoding metadata from a single crate's metadata
 
+use core::prelude::*;
+
 use metadata::cstore::crate_metadata;
 use metadata::common::*;
 use metadata::csearch::{ProvidedTraitMethodInfo, StaticMethodInfo};

src/librustc/metadata/encoder.rs

@@ -10,6 +10,8 @@
 
 // Metadata encoding
 
+use core::prelude::*;
+
 use metadata::common::*;
 use metadata::cstore;
 use metadata::decoder;

src/librustc/metadata/filesearch.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 // A module for searching for libraries
 // FIXME (#2658): I'm not happy how this module turned out. Should
 // probably just be folded into cstore.

src/librustc/metadata/loader.rs

@@ -8,9 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
 //! Finds crate binaries and loads their metadata
 
+use core::prelude::*;
+
 use lib::llvm::{False, llvm, mk_object_file, mk_section_iter};
 use metadata::decoder;
 use metadata::encoder;

src/librustc/metadata/tydecode.rs

@@ -14,6 +14,8 @@
 // tjc note: Would be great to have a `match check` macro equivalent
 // for some of these
 
+use core::prelude::*;
+
 use middle::ty;
 
 use syntax::abi::AbiSet;

src/librustc/metadata/tyencode.rs

@@ -10,6 +10,8 @@
 
 // Type encoding
 
+use core::prelude::*;
+
 use middle::ty::param_ty;
 use middle::ty;
 

src/librustc/middle/astencode.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use c = metadata::common;
 use cstore = metadata::cstore;
 use driver::session::Session;

src/librustc/middle/borrowck/check_loans.rs

@@ -17,6 +17,8 @@
 // 3. assignments do not affect things loaned out as immutable
 // 4. moves do not affect things loaned out in any way
 
+use core::prelude::*;
+
 use middle::moves;
 use middle::borrowck::*;
 use mc = middle::mem_categorization;

src/librustc/middle/check_const.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use driver::session::Session;
 use middle::resolve;
 use middle::ty;

src/librustc/middle/check_match.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use middle::const_eval::{compare_const_vals, lookup_const_by_id};
 use middle::const_eval::{eval_const_expr, const_val, const_bool};
 use middle::pat_util::*;

src/librustc/middle/const_eval.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use metadata::csearch;
 use middle::astencode;
 use middle::ty;

src/librustc/middle/dataflow.rs

@@ -16,6 +16,8 @@
  * GEN and KILL bits for each expression.
  */
 
+use core::prelude::*;
+
 use core::cast;
 use core::uint;
 use syntax::ast;

src/librustc/middle/entry.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use driver::session;
 use driver::session::Session;
 use syntax::parse::token::special_idents;

src/librustc/middle/freevars.rs

@@ -11,6 +11,8 @@
 // A pass that annotates for each loops and functions with the free
 // variables that they contain.
 
+use core::prelude::*;
+
 use middle::resolve;
 use middle::ty;
 

src/librustc/middle/kind.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use middle::freevars::freevar_entry;
 use middle::freevars;
 use middle::pat_util;

src/librustc/middle/lang_items.rs

@@ -19,6 +19,8 @@
 //
 // * Functions called by the compiler itself.
 
+use core::prelude::*;
+
 use driver::session::Session;
 use metadata::csearch::each_lang_item;
 use metadata::cstore::iter_crate_data;

src/librustc/middle/lint.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
+use driver::session::Session;
 use driver::session;
 use middle::ty;
 use middle::pat_util;

src/librustc/middle/liveness.rs

@@ -102,6 +102,7 @@
  *   to return explicitly.
  */
 
+use core::prelude::*;
 
 use middle::lint::{unused_variable, dead_assignment};
 use middle::pat_util;

src/librustc/middle/mem_categorization.rs

@@ -46,6 +46,8 @@
  * then an index to jump forward to the relevant item.
  */
 
+use core::prelude::*;
+
 use middle::ty;
 use middle::typeck;
 use util::ppaux::{ty_to_str, region_to_str, Repr};

src/librustc/middle/moves.rs

@@ -206,6 +206,8 @@ and so on.
 
 */
 
+use core::prelude::*;
+
 use middle::pat_util::{pat_bindings};
 use middle::freevars;
 use middle::ty;

src/librustc/middle/pat_util.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use middle::resolve;
 
 use core::hashmap::HashMap;

src/librustc/middle/privacy.rs

@@ -11,6 +11,8 @@
 // A pass that checks to make sure private fields and methods aren't used
 // outside their scopes.
 
+use core::prelude::*;
+
 use metadata::csearch;
 use middle::ty::{ty_struct, ty_enum};
 use middle::ty;

src/librustc/middle/region.rs

@@ -17,6 +17,8 @@ region parameterized.
 
 */
 
+use core::prelude::*;
+
 use driver::session::Session;
 use metadata::csearch;
 use middle::resolve;

src/librustc/middle/resolve.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use driver::session::Session;
 use metadata::csearch::{each_path, get_trait_method_def_ids};
 use metadata::csearch::get_method_name_and_explicit_self;

src/librustc/middle/subst.rs

@@ -10,6 +10,8 @@
 
 // Type substitutions.
 
+use core::prelude::*;
+
 use middle::ty;
 use util::ppaux::Repr;