---

yaml
---
r: 60639
b: refs/heads/auto
c: 1be40be
h: refs/heads/master
i:
  60637: 26db4e2
  60635: 59d288e
  60631: 797689d
  60623: fda5b6f
  60607: ac989bd
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: c10e0cb9c984ece484a5c8c9c4c20369e2be499b
+refs/heads/auto: 1be40be613177d4849f42da284a3af74e1d58da2
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/test/auxiliary/cci_capture_clause.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::comm::*;
+use std::comm::*;
 
 pub fn foo<T:Owned + Copy>(x: T) -> Port<T> {
     let (p, c) = stream();

branches/auto/src/test/auxiliary/cci_class_cast.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::to_str::*;
+use std::to_str::*;
 
 pub mod kitty {
     pub struct cat {

branches/auto/src/test/auxiliary/issue-2526.rs

@@ -13,7 +13,7 @@
        uuid = "54cc1bc9-02b8-447c-a227-75ebc923bc29")];
 #[crate_type = "lib"];
 
-extern mod std;
+extern mod extra;
 
 struct arc_destruct<T> {
   _data: int,

branches/auto/src/test/auxiliary/issue-2631-a.rs

@@ -11,9 +11,9 @@
 #[link(name = "req")];
 #[crate_type = "lib"];
 
-extern mod std;
+extern mod extra;
 
-use core::hashmap::HashMap;
+use std::hashmap::HashMap;
 
 pub type header_map = HashMap<~str, @mut ~[@~str]>;
 

branches/auto/src/test/auxiliary/trait_inheritance_overloading_xc.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cmp::Eq;
+use std::cmp::Eq;
 
 pub trait MyNum : Add<Self,Self> + Sub<Self,Self> + Mul<Self,Self> + Eq {
 }

branches/auto/src/test/bench/core-map.rs

@@ -8,14 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
-use core::io;
-use std::time;
-use std::treemap::TreeMap;
-use core::hashmap::{HashMap, HashSet};
-use core::trie::TrieMap;
-use core::rand::Rng;
+use std::io;
+use extra::time;
+use extra::treemap::TreeMap;
+use std::hashmap::{HashMap, HashSet};
+use std::trie::TrieMap;
+use std::rand::Rng;
 
 fn timed(label: &str, f: &fn()) {
     let start = time::precise_time_s();
@@ -103,7 +103,7 @@ fn main() {
     let mut rand = vec::with_capacity(n_keys);
 
     {
-        let mut rng = core::rand::IsaacRng::new_seeded([1, 1, 1, 1, 1, 1, 1]);
+        let mut rng = std::rand::IsaacRng::new_seeded([1, 1, 1, 1, 1, 1, 1]);
         let mut set = HashSet::new();
         while set.len() != n_keys {
             let next = rng.next() as uint;

branches/auto/src/test/bench/core-set.rs

@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use core::hashmap::HashSet;
-use std::bitv::BitvSet;
-use std::treemap::TreeSet;
+extern mod extra;
+use std::hashmap::HashSet;
+use extra::bitv::BitvSet;
+use extra::treemap::TreeSet;
 
 struct Results {
     sequential_ints: float,
@@ -24,9 +24,9 @@ struct Results {
 }
 
 fn timed(result: &mut float, op: &fn()) {
-    let start = std::time::precise_time_s();
+    let start = extra::time::precise_time_s();
     op();
-    let end = std::time::precise_time_s();
+    let end = extra::time::precise_time_s();
     *result = (end - start);
 }
 
@@ -168,21 +168,21 @@ fn main() {
         let mut results = empty_results();
         results.bench_int(&mut rng, num_keys, max, || HashSet::new::<uint>());
         results.bench_str(&mut rng, num_keys, || HashSet::new::<~str>());
-        write_results("core::hashmap::HashSet", &results);
+        write_results("std::hashmap::HashSet", &results);
     }
 
     {
         let mut rng = rand::IsaacRng::new_seeded(seed);
         let mut results = empty_results();
         results.bench_int(&mut rng, num_keys, max, || TreeSet::new::<uint>());
         results.bench_str(&mut rng, num_keys, || TreeSet::new::<~str>());
-        write_results("std::treemap::TreeSet", &results);
+        write_results("extra::treemap::TreeSet", &results);
     }
 
     {
         let mut rng = rand::IsaacRng::new_seeded(seed);
         let mut results = empty_results();
         results.bench_int(&mut rng, num_keys, max, || BitvSet::new());
-        write_results("std::bitv::BitvSet", &results);
+        write_results("extra::bitv::BitvSet", &results);
     }
 }

branches/auto/src/test/bench/core-std.rs

@@ -8,13 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Microbenchmarks for various functions in core and std
+// Microbenchmarks for various functions in std and extra
 
-extern mod std;
+extern mod extra;
 
-use std::time::precise_time_s;
-use core::rand::RngUtil;
-use core::util;
+use extra::time::precise_time_s;
+use std::rand::RngUtil;
+use std::util;
 
 macro_rules! bench (
     ($id:ident) => (maybe_run_test(argv, stringify!($id).to_owned(), $id))

branches/auto/src/test/bench/graph500-bfs.rs

@@ -16,14 +16,14 @@ An implementation of the Graph500 Breadth First Search problem in Rust.
 
 */
 
-extern mod std;
-use std::arc;
-use std::time;
-use std::deque::Deque;
-use std::par;
-use core::hashmap::HashSet;
-use core::int::abs;
-use core::rand::RngUtil;
+extern mod extra;
+use extra::arc;
+use extra::time;
+use extra::deque::Deque;
+use extra::par;
+use std::hashmap::HashSet;
+use std::int::abs;
+use std::rand::RngUtil;
 
 type node_id = i64;
 type graph = ~[~[node_id]];

branches/auto/src/test/bench/msgsend-pipes-shared.rs

@@ -18,11 +18,11 @@
 // different scalability characteristics compared to the select
 // version.
 
-extern mod std;
-use core::io::Writer;
-use core::io::WriterUtil;
+extern mod extra;
+use std::io::Writer;
+use std::io::WriterUtil;
 
-use core::comm::{Port, Chan, SharedChan};
+use std::comm::{Port, Chan, SharedChan};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y = *ptr::to_unsafe_ptr(&($x)); y } }
@@ -61,7 +61,7 @@ fn run(args: &[~str]) {
     let size = uint::from_str(args[1]).get();
     let workers = uint::from_str(args[2]).get();
     let num_bytes = 100;
-    let start = std::time::precise_time_s();
+    let start = extra::time::precise_time_s();
     let mut worker_results = ~[];
     for uint::range(0, workers) |_i| {
         let to_child = to_child.clone();
@@ -87,7 +87,7 @@ fn run(args: &[~str]) {
     to_child.send(stop);
     move_out!(to_child);
     let result = from_child.recv();
-    let end = std::time::precise_time_s();
+    let end = extra::time::precise_time_s();
     let elapsed = end - start;
     io::stdout().write_str(fmt!("Count is %?\n", result));
     io::stdout().write_str(fmt!("Test took %? seconds\n", elapsed));

branches/auto/src/test/bench/msgsend-pipes.rs

@@ -14,11 +14,11 @@
 //
 // I *think* it's the same, more or less.
 
-extern mod std;
-use core::io::Writer;
-use core::io::WriterUtil;
+extern mod extra;
+use std::io::Writer;
+use std::io::WriterUtil;
 
-use core::comm::{Port, PortSet, Chan, stream};
+use std::comm::{Port, PortSet, Chan, stream};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y = *ptr::to_unsafe_ptr(&($x)); y } }
@@ -57,7 +57,7 @@ fn run(args: &[~str]) {
     let size = uint::from_str(args[1]).get();
     let workers = uint::from_str(args[2]).get();
     let num_bytes = 100;
-    let start = std::time::precise_time_s();
+    let start = extra::time::precise_time_s();
     let mut worker_results = ~[];
     for uint::range(0, workers) |_i| {
         let (from_parent_, to_child) = stream();
@@ -84,7 +84,7 @@ fn run(args: &[~str]) {
     to_child.send(stop);
     move_out!(to_child);
     let result = from_child.recv();
-    let end = std::time::precise_time_s();
+    let end = extra::time::precise_time_s();
     let elapsed = end - start;
     io::stdout().write_str(fmt!("Count is %?\n", result));
     io::stdout().write_str(fmt!("Test took %? seconds\n", elapsed));

branches/auto/src/test/bench/msgsend-ring-mutex-arcs.rs

@@ -15,11 +15,11 @@
 
 // This also serves as a pipes test, because ARCs are implemented with pipes.
 
-extern mod std;
-use std::time;
-use std::arc;
-use std::future;
-use core::cell::Cell;
+extern mod extra;
+use extra::time;
+use extra::arc;
+use extra::future;
+use std::cell::Cell;
 
 // A poor man's pipe.
 type pipe = arc::MutexARC<~[uint]>;

branches/auto/src/test/bench/msgsend-ring-pipes.rs

@@ -16,13 +16,13 @@
 
 // This version uses automatically compiled channel contracts.
 
-extern mod std;
+extern mod extra;
 
-use core::cell::Cell;
-use core::pipes::recv;
-use core::util;
-use std::time;
-use std::future;
+use std::cell::Cell;
+use std::pipes::recv;
+use std::util;
+use extra::time;
+use extra::future;
 
 proto! ring (
     num:send {

branches/auto/src/test/bench/msgsend-ring-rw-arcs.rs

@@ -15,12 +15,12 @@
 
 // This also serves as a pipes test, because ARCs are implemented with pipes.
 
-extern mod std;
+extern mod extra;
 
-use core::cell::Cell;
-use std::time;
-use std::arc;
-use std::future;
+use std::cell::Cell;
+use extra::time;
+use extra::arc;
+use extra::future;
 
 // A poor man's pipe.
 type pipe = arc::RWARC<~[uint]>;

branches/auto/src/test/bench/noise.rs

@@ -1,6 +1,6 @@
 // Perlin noise benchmark from https://gist.github.com/1170424
 
-use core::rand::{Rng, RngUtil};
+use std::rand::{Rng, RngUtil};
 
 struct Vec2 {
     x: f32,

branches/auto/src/test/bench/pingpong.rs

@@ -12,11 +12,11 @@
 
 // xfail-pretty
 
-extern mod std;
+extern mod extra;
 
-use core::cell::Cell;
-use core::pipes::*;
-use std::time::precise_time_s;
+use std::cell::Cell;
+use std::pipes::*;
+use extra::time::precise_time_s;
 
 proto! pingpong (
     ping: send {
@@ -117,10 +117,10 @@ pub fn spawn_service_recv<T:Owned,Tb:Owned>(
     client
 }
 
-fn switch<T:Owned,Tb:Owned,U>(endp: core::pipes::RecvPacketBuffered<T, Tb>,
+fn switch<T:Owned,Tb:Owned,U>(endp: std::pipes::RecvPacketBuffered<T, Tb>,
                               f: &fn(v: Option<T>) -> U)
                               -> U {
-    f(core::pipes::try_recv(endp))
+    f(std::pipes::try_recv(endp))
 }
 
 // Here's the benchmark

branches/auto/src/test/bench/shootout-ackermann.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
+extern mod extra;
 
 fn ack(m: int, n: int) -> int {
     if m == 0 {

branches/auto/src/test/bench/shootout-binarytrees.rs

@@ -12,8 +12,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-use std::arena;
+extern mod extra;
+use extra::arena;
 
 enum tree<'self> {
     nil,

branches/auto/src/test/bench/shootout-chameneos-redux.rs

@@ -10,10 +10,10 @@
 
 // chameneos
 
-extern mod std;
-use std::sort;
-use core::cell::Cell;
-use core::comm::*;
+extern mod extra;
+use extra::sort;
+use std::cell::Cell;
+use std::comm::*;
 
 fn print_complements() {
     let all = ~[Blue, Red, Yellow];

branches/auto/src/test/bench/shootout-fannkuch-redux.rs

@@ -1,6 +1,6 @@
-use core::from_str::FromStr;
-use core::i32::range;
-use core::vec::MutableVector;
+use std::from_str::FromStr;
+use std::i32::range;
+use std::vec::MutableVector;
 
 fn max(a: i32, b: i32) -> i32 {
     if a > b {

branches/auto/src/test/bench/shootout-fasta-redux.rs

@@ -1,8 +1,8 @@
-use core::cast::transmute;
-use core::from_str::FromStr;
-use core::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite, size_t};
-use core::uint::{min, range};
-use core::vec::bytes::copy_memory;
+use std::cast::transmute;
+use std::from_str::FromStr;
+use std::libc::{FILE, STDOUT_FILENO, c_int, fdopen, fputc, fputs, fwrite, size_t};
+use std::uint::{min, range};
+use std::vec::bytes::copy_memory;
 
 static LINE_LEN: uint = 60;
 static LOOKUP_SIZE: uint = 4 * 1024;