---

yaml
---
r: 138701
b: refs/heads/try2
c: dfb5c10
h: refs/heads/master
i:
  138699: 9384333
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 55461d888f63e7113f1ea40e586e4917abe4815b
+refs/heads/try2: dfb5c10dea0dd7bc56950148fa23fd02a07706fa
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/compiletest/common.rs

@@ -10,8 +10,6 @@
 
 use core::prelude::*;
 
-use cmp;
-
 #[deriving_eq]
 pub enum mode {
     mode_compile_fail,

branches/try2/src/compiletest/compiletest.rc

@@ -32,7 +32,6 @@ pub mod errors;
 use std::getopts;
 use std::test;
 
-use core::{result, either};
 use core::result::{Ok, Err};
 
 use common::config;

branches/try2/src/compiletest/errors.rs

@@ -10,8 +10,6 @@
 
 use core::prelude::*;
 
-use common::config;
-
 use core::io;
 use core::io::ReaderUtil;
 use core::str;

branches/try2/src/compiletest/procsrv.rs

@@ -13,14 +13,11 @@ use core::prelude::*;
 use core::io::{ReaderUtil, WriterUtil};
 use core::io;
 use core::libc::{c_int, pid_t};
-use core::libc;
 use core::os;
-use core::pipes;
 use core::run::spawn_process;
 use core::run;
 use core::str;
 use core::task;
-use core::vec;
 
 #[cfg(target_os = "win32")]
 fn target_env(lib_path: ~str, prog: ~str) -> ~[(~str,~str)] {

branches/try2/src/compiletest/runtest.rs

@@ -10,14 +10,12 @@
 
 use core::prelude::*;
 
-use common;
 use common::mode_run_pass;
 use common::mode_run_fail;
 use common::mode_compile_fail;
 use common::mode_pretty;
 use common::config;
 use errors;
-use header;
 use header::load_props;
 use header::TestProps;
 use procsrv;

branches/try2/src/compiletest/util.rs

@@ -10,12 +10,10 @@
 
 use core::prelude::*;
 
-use common;
 use common::config;
 
 use core::io;
 use core::os::getenv;
-use core::os;
 
 pub fn make_new_path(path: ~str) -> ~str {
 

branches/try2/src/libcore/bool.rs

@@ -11,9 +11,7 @@
 
 //! Boolean logic
 
-use bool;
 use cmp;
-use cmp::Eq;
 use option::{None, Option, Some};
 
 /// Negation / inverse

branches/try2/src/libcore/char.rs

@@ -10,7 +10,6 @@
 
 //! Utilities for manipulating the char type
 
-use char;
 use cmp::Eq;
 use option::{None, Option, Some};
 use str;

branches/try2/src/libcore/dvec.rs

@@ -20,7 +20,6 @@ Note that recursive use is not permitted.
 */
 
 use cast;
-use cast::reinterpret_cast;
 use prelude::*;
 use ptr::null;
 use vec;

branches/try2/src/libcore/either.rs

@@ -11,7 +11,6 @@
 //! A type that represents one of two alternatives
 
 use cmp::Eq;
-use cmp;
 use kinds::Copy;
 use result::Result;
 use result;

branches/try2/src/libcore/flate.rs

@@ -17,7 +17,6 @@ Simple compression
 use libc;
 use libc::{c_void, size_t, c_int};
 use ptr;
-use rand;
 use vec;
 
 extern mod rustrt {

branches/try2/src/libcore/hash.rs

@@ -21,7 +21,6 @@
 
 use io;
 use io::{Writer, WriterUtil};
-use os;
 use to_bytes::IterBytes;
 use uint;
 use vec;

branches/try2/src/libcore/hashmap.rs

@@ -19,11 +19,8 @@ pub mod linear {
     use iter::BaseIter;
     use hash::Hash;
     use iter;
-    use kinds::Copy;
     use option::{None, Option, Some};
-    use option;
     use rand;
-    use to_bytes::IterBytes;
     use uint;
     use vec;
 

branches/try2/src/libcore/io.rs

@@ -16,14 +16,11 @@ Basic input/output
 
 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 prelude::*;
 use ptr;
@@ -715,7 +712,9 @@ pub fn mk_file_writer(path: &Path, flags: &[FileFlag])
     -> Result<Writer, ~str> {
 
     #[cfg(windows)]
-    fn wb() -> c_int { (O_WRONLY | O_BINARY) as c_int }
+    fn wb() -> c_int {
+      (O_WRONLY | libc::consts::os::extra::O_BINARY) as c_int
+    }
 
     #[cfg(unix)]
     fn wb() -> c_int { O_WRONLY as c_int }

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

@@ -9,8 +9,6 @@
 // except according to those terms.
 
 mod inst {
-    use cast;
-    use dlist;
     use dlist::DList;
     use managed;
     use option::{Option, Some};

branches/try2/src/libcore/libc.rs

@@ -1007,7 +1007,6 @@ pub mod funcs {
 
     pub mod c95 {
         use libc::types::common::c95::{FILE, c_void, fpos_t};
-        use libc::types::common::posix88::dirent_t;
         use libc::types::os::arch::c95::{c_char, c_double, c_int, c_long};
         use libc::types::os::arch::c95::{c_uint, c_ulong, c_void, size_t};
 

branches/try2/src/libcore/managed.rs

@@ -10,12 +10,9 @@
 
 //! Operations on managed box types
 
-use cast::transmute;
-use cmp::{Eq, Ord};
-use managed::raw::BoxRepr;
-use prelude::*;
 use ptr;
 
+#[cfg(notest)] use cmp::{Eq, Ord};
 
 pub mod raw {
 

branches/try2/src/libcore/num/f64.rs

@@ -13,7 +13,6 @@
 use cmath;
 use cmp;
 use libc::{c_double, c_int};
-use libc;
 use num::NumCast;
 use num::strconv;
 use num;

branches/try2/src/libcore/num/float.rs

@@ -20,18 +20,13 @@
 
 // PORT this must match in width according to architecture
 
-use m_float = f64;
-
 use cmp::{Eq, Ord};
-use cmp;
 use f64;
 use num::NumCast;
 use num::strconv;
 use num;
 use ops;
 use option::{None, Option, Some};
-use str;
-use uint;
 use to_str;
 use from_str;
 

branches/try2/src/libcore/num/int-template.rs

@@ -10,21 +10,16 @@
 
 use T = self::inst::T;
 
-use char;
 use cmp::{Eq, Ord};
-use cmp;
 use to_str::ToStr;
 use from_str::FromStr;
 use num::{ToStrRadix, FromStrRadix};
 use num::strconv;
 use num;
 use prelude::*;
-use str;
-use uint;
-use vec;
-use i8;
-use i16;
-use i32;
+
+#[cfg(notest)] use cmp::{Eq, Ord};
+
 pub use cmp::{min, max};
 
 pub const bits : uint = inst::bits;

branches/try2/src/libcore/num/num.rs

@@ -12,10 +12,7 @@
 use cmp::{Ord, Eq};
 use ops::{Add, Div, Modulo, Mul, Neg, Sub};
 use option::{None, Option, Some};
-use char;
-use str;
 use kinds::Copy;
-use vec;
 
 pub mod strconv;
 

branches/try2/src/libcore/num/uint-template.rs

@@ -11,22 +11,14 @@
 use T = self::inst::T;
 use T_SIGNED = self::inst::T_SIGNED;
 
-use char;
 use cmp::{Eq, Ord};
-use cmp;
 use to_str::ToStr;
 use from_str::FromStr;
 use num::{ToStrRadix, FromStrRadix};
 use num::strconv;
 use num;
 use option::{None, Option, Some};
 use prelude::*;
-use str;
-use uint;
-use vec;
-use u8;
-use u16;
-use u32;
 
 pub use cmp::{min, max};
 
@@ -357,7 +349,6 @@ pub fn to_str_radix37() {
     uint::to_str_radix(100u, 37u);
 }
 
-use io;
 #[test]
 pub fn test_ranges() {
     let mut l = ~[];

branches/try2/src/libcore/num/uint-template/uint.rs

@@ -19,7 +19,6 @@ pub use self::inst::{
 
 pub mod inst {
     use sys;
-    use uint;
     use iter;
 
     pub type T = uint;

branches/try2/src/libcore/option.rs

@@ -43,9 +43,6 @@ let unwrapped_msg = match msg {
 
 use cmp::{Eq,Ord};
 use kinds::Copy;
-use option;
-use ptr;
-use str;
 use util;
 use num::Zero;
 

branches/try2/src/libcore/os.rs

@@ -27,7 +27,6 @@
  */
 
 use cast;
-use either;
 use io;
 use libc;
 use libc::{c_char, c_void, c_int, c_uint, size_t, ssize_t};
@@ -38,7 +37,6 @@ use prelude::*;
 use ptr;
 use str;
 use task;
-use task::TaskBuilder;
 use uint;
 use vec;
 

branches/try2/src/libcore/path.rs

@@ -17,7 +17,6 @@ Cross-platform file path handling
 use cmp::Eq;
 use libc;
 use option::{None, Option, Some};
-use ptr;
 use str;
 use to_str::ToStr;
 
@@ -830,7 +829,6 @@ pub pure fn normalize(components: &[~str]) -> ~[~str] {
 pub mod windows {
     use libc;
     use option::{None, Option, Some};
-    use to_str::ToStr;
 
     #[inline(always)]
     pub pure fn is_sep(u: u8) -> bool {

branches/try2/src/libcore/pipes.rs

@@ -90,10 +90,8 @@ use kinds::Owned;
 use libc;
 use option;
 use option::{None, Option, Some, unwrap};
-use pipes;
 use unstable::intrinsics;
 use ptr;
-use unstable;
 use task;
 use vec;
 

branches/try2/src/libcore/ptr.rs

@@ -15,10 +15,7 @@ use cmp::{Eq, Ord};
 use libc;
 use libc::{c_void, size_t};
 use unstable::intrinsics::{memmove32,memmove64};
-use ptr;
-use str;
 use sys;
-use vec;
 
 #[nolink]
 #[abi = "cdecl"]

branches/try2/src/libcore/repr.rs

@@ -15,25 +15,19 @@ More runtime type reflection
 */
 
 use cast::transmute;
-use cast;
 use char;
 use dvec::DVec;
 use intrinsic;
 use intrinsic::{TyDesc, TyVisitor, visit_tydesc};
-use io;
 use io::{Writer, WriterUtil};
 use libc::c_void;
 use managed;
-use managed::raw::BoxHeaderRepr;
 use ptr;
 use reflect;
 use reflect::{MovePtr, MovePtrAdaptor, align};
-use repr;
 use str;
 use sys;
-use sys::TypeDesc;
 use to_str::ToStr;
-use uint;
 use vec::UnboxedVecRepr;
 use vec::raw::{VecRepr, SliceRepr};
 use vec;

branches/try2/src/libcore/result.rs

@@ -12,7 +12,6 @@
 
 // NB: transitionary, de-mode-ing.
 
-use cmp;
 use cmp::Eq;
 use either;
 use either::Either;