---

yaml
---
r: 39604
b: refs/heads/incoming
c: a51661e
h: refs/heads/master
v: v3

Author: auroranockert

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 57c599914a19861686030b238a0edc7ebb996068
+refs/heads/incoming: a51661e8c1d62f88a5b6f368f397fa6b33785973
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/driver/driver.rs

@@ -12,18 +12,18 @@
 extern mod core(vers = "0.6");
 
 #[cfg(cargo)]
-extern mod this(name = "cargo", vers = "0.6");
+extern mod self(name = "cargo", vers = "0.6");
 
 #[cfg(fuzzer)]
-extern mod this(name = "fuzzer", vers = "0.6");
+extern mod self(name = "fuzzer", vers = "0.6");
 
 #[cfg(rustdoc)]
-extern mod this(name = "rustdoc", vers = "0.6");
+extern mod self(name = "rustdoc", vers = "0.6");
 
 #[cfg(rusti)]
-extern mod this(name = "rusti", vers = "0.6");
+extern mod self(name = "rusti", vers = "0.6");
 
 #[cfg(rustc)]
-extern mod this(name = "rustc", vers = "0.6");
+extern mod self(name = "rustc", vers = "0.6");
 
-fn main() { this::main() }
+fn main() { self::main() }

branches/incoming/src/libcargo/pgp.rs

@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::os;
-use core::run;
-
 fn gpgv(args: ~[~str]) -> { status: int, out: ~str, err: ~str } {
     return run::program_output(~"gpgv", args);
 }

branches/incoming/src/libcore/at_vec.rs

@@ -15,26 +15,21 @@
 #[forbid(deprecated_pattern)];
 
 use cast::transmute;
-use iter;
-use libc;
 use ptr::addr_of;
-use sys;
-use uint;
-use vec;
 
 /// Code for dealing with @-vectors. This is pretty incomplete, and
 /// contains a bunch of duplication from the code for ~-vectors.
 
 #[abi = "cdecl"]
-pub extern mod rustrt {
+extern mod rustrt {
     #[legacy_exports];
     fn vec_reserve_shared_actual(++t: *sys::TypeDesc,
                                  ++v: **vec::raw::VecRepr,
                                  ++n: libc::size_t);
 }
 
 #[abi = "rust-intrinsic"]
-pub extern mod rusti {
+extern mod rusti {
     #[legacy_exports];
     fn move_val_init<T>(dst: &mut T, -src: T);
 }
@@ -162,13 +157,6 @@ pub mod traits {
 pub mod traits {}
 
 pub mod raw {
-    use at_vec::{rusti, rustrt};
-    use libc;
-    use ptr;
-    use sys;
-    use uint;
-    use vec;
-
     pub type VecRepr = vec::raw::VecRepr;
     pub type SliceRepr = vec::raw::SliceRepr;
 

branches/incoming/src/libcore/bool.rs

@@ -16,7 +16,6 @@
 
 //! Boolean logic
 
-use cmp;
 use cmp::Eq;
 
 /// Negation / inverse

branches/incoming/src/libcore/char.rs

@@ -15,10 +15,6 @@
 #[forbid(deprecated_pattern)];
 
 use cmp::Eq;
-use str;
-use u32;
-use uint;
-use unicode;
 
 /*
     Lu  Uppercase_Letter    an uppercase letter

branches/incoming/src/libcore/condition.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use task;
-
 // helper for transmutation, shown below.
 type RustClosure = (int,int);
 pub struct Handler<T, U> {

branches/incoming/src/libcore/core.rc

@@ -235,7 +235,7 @@ mod stackwalk;
 // 'core' so that macro-expanded references to core::error and such
 // can be resolved within libcore.
 #[doc(hidden)] // FIXME #3538
-pub mod core {
+mod core {
     pub const error : u32 = 1_u32;
     pub const warn : u32 = 2_u32;
     pub const info : u32 = 3_u32;

branches/incoming/src/libcore/dlist.rs

@@ -22,10 +22,6 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-use managed;
-use option;
-use vec;
-
 type DListLink<T> = Option<DListNode<T>>;
 
 enum DListNode<T> = @{

branches/incoming/src/libcore/dvec.rs

@@ -23,10 +23,8 @@ Note that recursive use is not permitted.
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-use cast;
 use cast::reinterpret_cast;
 use ptr::null;
-use vec;
 
 /**
  * A growable, modifiable vector type that accumulates elements into a

branches/incoming/src/libcore/either.rs

@@ -14,11 +14,8 @@
 
 //! A type that represents one of two alternatives
 
-use cmp;
 use cmp::Eq;
-use result;
 use result::Result;
-use vec;
 
 /// The either type
 #[deriving_eq]

branches/incoming/src/libcore/extfmt.rs

@@ -82,7 +82,7 @@ debug!("hello, %s!", "world");
 
 use cmp::Eq;
 use option::{Some, None};
-use str;
+
 
 /*
  * We have a 'ct' (compile-time) module that parses format strings into a
@@ -98,10 +98,6 @@ use str;
 // Functions used by the fmt extension at compile time
 #[doc(hidden)]
 pub mod ct {
-    use char;
-    use str;
-    use vec;
-
     pub enum Signedness { Signed, Unsigned, }
     pub enum Caseness { CaseUpper, CaseLower, }
     pub enum Ty {
@@ -336,12 +332,6 @@ pub mod ct {
 // implement it 0this way, I think.
 #[doc(hidden)]
 pub mod rt {
-    use float;
-    use str;
-    use sys;
-    use uint;
-    use vec;
-
     pub const flag_none : u32 = 0u32;
     pub const flag_left_justify   : u32 = 0b00000000000001u32;
     pub const flag_left_zero_pad  : u32 = 0b00000000000010u32;

branches/incoming/src/libcore/f32.rs

@@ -14,9 +14,6 @@
 
 //! Operations and constants for `f32`
 
-use cmp;
-use num;
-
 pub use cmath::c_float_utils::*;
 pub use cmath::c_float_targ_consts::*;
 

branches/incoming/src/libcore/f64.rs

@@ -14,11 +14,6 @@
 
 //! Operations and constants for `f64`
 
-use cmath;
-use cmp;
-use libc;
-use num;
-
 pub use cmath::c_double_utils::*;
 pub use cmath::c_double_targ_consts::*;
 

branches/incoming/src/libcore/flate.rs

@@ -18,10 +18,7 @@ Simple compression
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-use libc;
 use libc::{c_void, size_t, c_int};
-use ptr;
-use vec;
 
 extern mod rustrt {
     fn tdefl_compress_mem_to_heap(psrc_buf: *const c_void,

branches/incoming/src/libcore/float.rs

@@ -26,13 +26,6 @@
 
 use m_float = f64;
 
-use cmp::{Eq, Ord};
-use f64;
-use num;
-use num::Num::from_int;
-use str;
-use uint;
-
 pub use f64::{add, sub, mul, div, rem, lt, le, eq, ne, ge, gt};
 pub use f64::logarithm;
 pub use f64::{acos, asin, atan2, cbrt, ceil, copysign, cosh, floor};
@@ -42,6 +35,8 @@ pub use f64::{lgamma, ln, log_radix, ln1p, log10, log2, ilog_radix};
 pub use f64::{modf, pow, round, sinh, tanh, tgamma, trunc};
 pub use f64::signbit;
 pub use f64::{j0, j1, jn, y0, y1, yn};
+use cmp::{Eq, Ord};
+use num::Num::from_int;
 
 pub const NaN: float = 0.0/0.0;
 

branches/incoming/src/libcore/gc.rs

@@ -39,15 +39,10 @@ with destructors.
 #[forbid(deprecated_mode)];
 #[forbid(deprecated_pattern)];
 
-use cast;
-use io;
-use libc::{size_t, uintptr_t};
-use ptr;
-use send_map::linear::LinearMap;
-use stackwalk;
-use sys;
-
 pub use stackwalk::Word;
+use libc::size_t;
+use libc::uintptr_t;
+use send_map::linear::LinearMap;
 
 // Mirrors rust_stack.h stk_seg
 struct StackSegment {

branches/incoming/src/libcore/hash.rs

@@ -23,12 +23,9 @@
  * CPRNG like rand::rng.
  */
 
-use io;
-use io::{Writer, WriterUtil};
-use os;
+use io::Writer;
+use io::WriterUtil;
 use to_bytes::IterBytes;
-use uint;
-use vec;
 
 /**
  * Types that can meaningfully be hashed should implement this.

branches/incoming/src/libcore/int-template.rs

@@ -14,15 +14,9 @@
 
 use T = self::inst::T;
 
-use char;
 use cmp::{Eq, Ord};
 use from_str::FromStr;
-use iter;
-use num;
 use num::Num::from_int;
-use str;
-use uint;
-use vec;
 
 pub const bits : uint = inst::bits;
 pub const bytes : uint = (inst::bits / 8);

branches/incoming/src/libcore/int-template/i16.rs

@@ -12,5 +12,5 @@
 
 mod inst {
     pub type T = i16;
-    pub const bits: uint = ::u16::bits;
-}
+    pub const bits: uint = u16::bits;
+}

branches/incoming/src/libcore/int-template/i32.rs

@@ -12,5 +12,5 @@
 
 mod inst {
     pub type T = i32;
-    pub const bits: uint = ::u32::bits;
+    pub const bits: uint = u32::bits;
 }

branches/incoming/src/libcore/int-template/i64.rs

@@ -12,5 +12,5 @@
 
 mod inst {
     pub type T = i64;
-    pub const bits: uint = ::u64::bits;
-}
+    pub const bits: uint = u64::bits;
+}

branches/incoming/src/libcore/int-template/i8.rs

@@ -12,5 +12,5 @@
 
 mod inst {
     pub type T = i8;
-    pub const bits: uint = ::u8::bits;
-}
+    pub const bits: uint = u8::bits;
+}

branches/incoming/src/libcore/int-template/int.rs

@@ -14,7 +14,7 @@ pub use self::inst::pow;
 
 mod inst {
     pub type T = int;
-    pub const bits: uint = ::uint::bits;
+    pub const bits: uint = uint::bits;
 
     /// Returns `base` raised to the power of `exponent`
     pub pure fn pow(base: int, exponent: uint) -> int {

branches/incoming/src/libcore/io.rs

@@ -21,18 +21,9 @@ use result::Result;
 
 use cmp::Eq;
 use dvec::DVec;
-use int;
-use libc;
 use libc::{c_int, c_long, c_uint, c_void, size_t, ssize_t};
 use libc::consts::os::posix88::*;
 use libc::consts::os::extra::*;
-use option;
-use os;
-use ptr;
-use result;
-use str;
-use uint;
-use vec;
 
 #[allow(non_camel_case_types)] // not sure what to do about this
 type fd_t = c_int;
@@ -1028,9 +1019,6 @@ pub fn read_whole_file(file: &Path) -> Result<~[u8], ~str> {
 // fsync related
 
 pub mod fsync {
-    use libc;
-    use option;
-    use os;
 
     pub enum Level {
         // whatever fsync does on that platform

branches/incoming/src/libcore/iter-trait.rs

@@ -16,7 +16,6 @@
 #[forbid(deprecated_pattern)];
 
 use cmp::{Eq, Ord};
-use iter;
 
 use self::inst::{IMPL_T, EACH, SIZE_HINT};
 

branches/incoming/src/libcore/iter-trait/dlist.rs

@@ -9,10 +9,6 @@
 // except according to those terms.
 
 mod inst {
-    use dlist;
-    use managed;
-    use option;
-
     #[allow(non_camel_case_types)]
     pub type IMPL_T<A> = dlist::DList<A>;
 
@@ -49,4 +45,4 @@ mod inst {
     pub pure fn SIZE_HINT<A>(self: &IMPL_T<A>) -> Option<uint> {
         Some(self.len())
     }
-}
+}