---

yaml
---
r: 30343
b: refs/heads/incoming
c: f686896
h: refs/heads/master
i:
  30341: b38b9f8
  30339: 672997b
  30335: 145ca46
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 47dac47e96fb47f84ac2f75781e2819ce80791a4
+refs/heads/incoming: f686896f60d901fd7f97add72fbc047691027baa
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -1,6 +1,6 @@
 export foo;
 
-import comm::*;
+use comm::*;
 
 fn foo<T: send copy>(x: T) -> Port<T> {
     let p = Port();

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

@@ -1,5 +1,5 @@
-import to_str::*;
-import to_str::ToStr;
+use to_str::*;
+use to_str::ToStr;
 
 mod kitty {
 

branches/incoming/src/test/auxiliary/cci_nested_lib.rs

@@ -1,4 +1,4 @@
-import dvec::DVec;
+use dvec::DVec;
 
 type entry<A,B> = {key: A, value: B};
 type alist<A,B> = { eq_fn: fn@(A,A) -> bool, data: DVec<entry<A,B>> };

branches/incoming/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs

@@ -2,7 +2,7 @@
 
 export rust;
 
-import name_pool::add;
+use name_pool::add;
 
 mod name_pool {
 

branches/incoming/src/test/auxiliary/issue-2196-c.rs

@@ -1,4 +1,4 @@
-import b::d;
+use b::d;
 
 type t = uint;
 

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

@@ -3,9 +3,9 @@
 
 use std;
 
-import dvec::*;
-import dvec::DVec;
-import std::map::hashmap;
+use dvec::*;
+use dvec::DVec;
+use std::map::hashmap;
 
 type header_map = hashmap<~str, @DVec<@~str>>;
 

branches/incoming/src/test/auxiliary/issue2378b.rs

@@ -1,7 +1,7 @@
 use issue2378a;
 
-import issue2378a::maybe;
-import issue2378a::methods;
+use issue2378a::maybe;
+use issue2378a::methods;
 
 type two_maybes<T> = {a: maybe<T>, b: maybe<T>};
 

branches/incoming/src/test/auxiliary/issue_2242_b.rs

@@ -2,7 +2,7 @@
 #[crate_type = "lib"];
 
 use a;
-import a::to_strz;
+use a::to_strz;
 
 impl int: to_strz {
     fn to_strz() -> ~str { fmt!("%?", self) }

branches/incoming/src/test/auxiliary/issue_2242_c.rs

@@ -3,7 +3,7 @@
 
 use a;
 
-import a::to_strz;
+use a::to_strz;
 
 impl bool: to_strz {
     fn to_strz() -> ~str { fmt!("%b", self) }

branches/incoming/src/test/auxiliary/issue_2316_b.rs

@@ -2,7 +2,7 @@ use issue_2316_a;
 
 mod cloth {
 
-import issue_2316_a::*;
+use issue_2316_a::*;
 
 export calico, gingham, flannel;
 export fabric;

branches/incoming/src/test/auxiliary/test_comm.rs

@@ -4,7 +4,7 @@
   Could probably be more minimal.
  */
 
-import libc::size_t;
+use libc::size_t;
 
 export port::{};
 export port;

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

@@ -5,11 +5,10 @@
 */
 
 use std;
-import rand;
-import std::map;
-import managed::Managed;
-import send_map::linear::*;
-import io::WriterUtil;
+use std::map;
+use managed::Managed;
+use send_map::linear::*;
+use io::WriterUtil;
 
 struct Results {
     sequential_ints: float;

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

@@ -2,11 +2,11 @@
 
 use std;
 
-import std::time::precise_time_s;
-import std::map;
-import std::map::{map, hashmap};
+use std::time::precise_time_s;
+use std::map;
+use std::map::{map, hashmap};
 
-import io::{Reader, ReaderUtil};
+use io::{Reader, ReaderUtil};
 
 fn main(argv: ~[~str]) {
     #macro[

branches/incoming/src/test/bench/core-vec-append.rs

@@ -1,8 +1,8 @@
 // A raw test of vector appending performance.
 
 use std;
-import dvec::DVec;
-import io::WriterUtil;
+use dvec::DVec;
+use io::WriterUtil;
 
 fn collect_raw(num: uint) -> ~[uint] {
     let mut result = ~[];

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

@@ -5,17 +5,17 @@ An implementation of the Graph500 Breadth First Search problem in Rust.
 */
 
 use std;
-import std::arc;
-import std::time;
-import std::map;
-import std::map::map;
-import std::map::hashmap;
-import std::deque;
-import std::deque::Deque;
-import std::par;
-import io::WriterUtil;
-import comm::*;
-import int::abs;
+use std::arc;
+use std::time;
+use std::map;
+use std::map::map;
+use std::map::hashmap;
+use std::deque;
+use std::deque::Deque;
+use std::par;
+use io::WriterUtil;
+use comm::*;
+use int::abs;
 
 type node_id = i64;
 type graph = ~[~[node_id]];

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

@@ -11,10 +11,10 @@
 // xfail-pretty
 
 use std;
-import io::Writer;
-import io::WriterUtil;
+use io::Writer;
+use io::WriterUtil;
 
-import pipes::{Port, Chan, SharedChan};
+use pipes::{Port, Chan, SharedChan};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }

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

@@ -7,10 +7,10 @@
 // xfail-pretty
 
 use std;
-import io::Writer;
-import io::WriterUtil;
+use io::Writer;
+use io::WriterUtil;
 
-import pipes::{Port, PortSet, Chan};
+use pipes::{Port, PortSet, Chan};
 
 macro_rules! move_out (
     { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } }

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

@@ -7,11 +7,11 @@
 
 // xfail-pretty
 
-import future::future;
+use future::future;
 
 use std;
-import std::time;
-import std::arc;
+use std::time;
+use std::arc;
 
 // A poor man's pipe.
 type pipe = arc::MutexARC<~[uint]>;

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

@@ -8,12 +8,12 @@
 
 // xfail-pretty
 
-import future::future;
+use future::future;
 
 use std;
-import std::time;
+use std::time;
 
-import pipes::recv;
+use pipes::recv;
 
 proto! ring (
     num:send {

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

@@ -7,11 +7,11 @@
 
 // xfail-pretty
 
-import future::future;
+use future::future;
 
 use std;
-import std::time;
-import std::arc;
+use std::time;
+use std::arc;
 
 // A poor man's pipe.
 type pipe = arc::RWARC<~[uint]>;

branches/incoming/src/test/bench/msgsend-ring.rs

@@ -4,11 +4,11 @@
 // that things will look really good once we get that lock out of the
 // message path.
 
-import comm::*;
-import future::future;
+use comm::*;
+use future::future;
 
 use std;
-import std::time;
+use std::time;
 
 fn thread_ring(i: uint,
                count: uint,

branches/incoming/src/test/bench/msgsend.rs

@@ -5,8 +5,8 @@
 // I *think* it's the same, more or less.
 
 use std;
-import io::Writer;
-import io::WriterUtil;
+use io::Writer;
+use io::WriterUtil;
 
 enum request {
     get_count,

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

@@ -4,8 +4,8 @@
 
 use std;
 
-import pipes::{spawn_service, recv};
-import std::time::precise_time_s;
+use pipes::{spawn_service, recv};
+use std::time::precise_time_s;
 
 proto! pingpong (
     ping: send {

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

@@ -1,6 +1,6 @@
 use std;
-import std::arena;
-import methods = std::arena::Arena;
+use std::arena;
+use methods = std::arena::Arena;
 
 enum tree/& { nil, node(&tree, &tree, int), }
 

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

@@ -1,9 +1,9 @@
 // chameneos
 
 use std;
-import std::map;
-import std::map::hashmap;
-import std::sort;
+use std::map;
+use std::map::hashmap;
+use std::sort;
 
 fn print_complements() {
     let all = ~[Blue, Red, Yellow];

branches/incoming/src/test/bench/shootout-fannkuchredux.rs

@@ -1,7 +1,5 @@
 // Based on Isaac Gouy's fannkuchredux.csharp
 use std;
-import int;
-import vec;
 
 fn fannkuch(n: int) -> int {
     fn perm1init(i: uint) -> int { return i as int; }

branches/incoming/src/test/bench/shootout-fasta.rs

@@ -6,11 +6,7 @@
  * http://shootout.alioth.debian.org/
  */
 use std;
-import vec;
-import uint;
-import int;
-import str;
-import io::WriterUtil;
+use io::WriterUtil;
 
 fn LINE_LENGTH() -> uint { return 60u; }
 

branches/incoming/src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -3,11 +3,11 @@
 // multi tasking k-nucleotide
 
 use std;
-import std::map;
-import std::map::hashmap;
-import std::sort;
-import io::ReaderUtil;
-import pipes::{stream, Port, Chan};
+use std::map;
+use std::map::hashmap;
+use std::sort;
+use io::ReaderUtil;
+use pipes::{stream, Port, Chan};
 
 // given a map, print a sorted version of it
 fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { 

branches/incoming/src/test/bench/shootout-k-nucleotide.rs

@@ -3,10 +3,10 @@
 // multi tasking k-nucleotide
 
 use std;
-import std::map;
-import std::map::hashmap;
-import std::sort;
-import io::ReaderUtil;
+use std::map;
+use std::map::hashmap;
+use std::sort;
+use io::ReaderUtil;
 
 // given a map, print a sorted version of it
 fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { 

branches/incoming/src/test/bench/shootout-mandelbrot.rs

@@ -13,8 +13,8 @@
 //  writes pbm image to output path
 
 use std;
-import io::WriterUtil;
-import std::map::hashmap;
+use io::WriterUtil;
+use std::map::hashmap;
 
 struct cmplx {
     re: f64;