---

yaml
---
r: 30342
b: refs/heads/incoming
c: 47dac47
h: refs/heads/master
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: ba94b64698c3494bc6d940ed1766e80defa0f928
+refs/heads/incoming: 47dac47e96fb47f84ac2f75781e2819ce80791a4
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/cargo/cargo.rc

@@ -26,6 +26,6 @@ use std(vers = "0.4");
 use rustc(vers = "0.4");
 use syntax(vers = "0.4");
 
-import core::*;
+use core::*;
 
 mod pgp;

branches/incoming/src/fuzzer/fuzzer.rc

@@ -10,7 +10,7 @@ use core(vers = "0.4");
 use std(vers = "0.4");
 use syntax(vers = "0.4");
 
-import core::*;
+use core::*;
 
 // Local Variables:
 // fill-column: 78;

branches/incoming/src/libstd/std.rc

@@ -15,7 +15,7 @@
 #[warn(non_camel_case_types)];
 
 use core(vers = "0.4");
-import core::*;
+use core::*;
 
 export net, net_tcp, net_ip, net_url;
 export uv, uv_ll, uv_iotask, uv_global_loop;

branches/incoming/src/libsyntax/syntax.rc

@@ -13,7 +13,7 @@
 use core(vers = "0.4");
 use std(vers = "0.4");
 
-import core::*;
+use core::*;
 
 mod attr;
 mod diagnostic;

branches/incoming/src/rustc/rustc.rc

@@ -18,7 +18,7 @@ use core(vers = "0.4");
 use std(vers = "0.4");
 use syntax(vers = "0.4");
 
-import core::*;
+use core::*;
 
 /*
 Alternate names for some modules.
@@ -27,11 +27,11 @@ I am using this to help extract metadata into its own crate. In metadata.rs
 it redefines all these modules in order to gate access from metadata to the
 rest of the compiler, then uses these to access the original implementation.
 */
-import util_ = util;
-import lib_ = lib;
-import driver_ = driver;
-import middle_ = middle;
-import back_ = back;
+use util_ = util;
+use lib_ = lib;
+use driver_ = driver;
+use middle_ = middle;
+use back_ = back;
 
 mod middle {
     mod trans {