---

yaml
---
r: 59135
b: refs/heads/incoming
c: e1a1992
h: refs/heads/master
i:
  59133: 2958d25
  59131: 7b12853
  59127: 8c11189
  59119: 6273bd0
  59103: 2d1f061
  59071: 9e974c7
  59007: e37c663
  58879: daa51a7
v: v3

Author: thestinger

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 66e1e517019c70450dcadeb0d876c686729215e3
+refs/heads/incoming: e1a199227635deddbdf010b3a79c2c96112909d7
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/at_vec.rs

@@ -11,10 +11,8 @@
 //! Managed vectors
 
 use cast::transmute;
-use container::Container;
 use kinds::Copy;
 use old_iter;
-use old_iter::BaseIter;
 use option::Option;
 use sys;
 use uint;

branches/incoming/src/libcore/comm.rs

@@ -13,13 +13,12 @@ Message passing
 */
 
 use cast::{transmute, transmute_mut};
-use container::Container;
 use either::{Either, Left, Right};
 use kinds::Owned;
 use option::{Option, Some, None};
 use uint;
+use unstable;
 use vec;
-use vec::OwnedVector;
 use util::replace;
 use unstable::sync::{Exclusive, exclusive};
 
@@ -578,7 +577,7 @@ impl<T:Owned,
 #[cfg(test)]
 mod test {
     use either::Right;
-    use super::{Chan, Port, oneshot, stream};
+    use super::{Chan, Port, oneshot, recv_one, stream};
 
     #[test]
     fn test_select2() {

branches/incoming/src/libcore/core.rc

@@ -68,6 +68,48 @@ they contained the following prologue:
 #[cfg(test)] pub use ops = realcore::ops;
 #[cfg(test)] pub use cmp = realcore::cmp;
 
+/* Reexported core operators */
+
+pub use kinds::{Const, Copy, Owned};
+pub use ops::{Drop};
+pub use ops::{Add, Sub, Mul, Div, Rem, Neg, Not};
+pub use ops::{BitAnd, BitOr, BitXor};
+pub use ops::{Shl, Shr, Index};
+
+
+/* Reexported types and traits */
+
+pub use option::{Option, Some, None};
+pub use result::{Result, Ok, Err};
+
+pub use path::Path;
+pub use path::GenericPath;
+pub use path::WindowsPath;
+pub use path::PosixPath;
+
+pub use tuple::{CopyableTuple, ImmutableTuple, ExtendedTupleOps};
+pub use str::{StrSlice};
+pub use container::{Container, Mutable};
+pub use vec::{CopyableVector, ImmutableVector};
+pub use vec::{ImmutableEqVector, ImmutableCopyableVector};
+pub use vec::{OwnedVector, OwnedCopyableVector, MutableVector};
+pub use old_iter::{BaseIter, ExtendedIter, EqIter, CopyableIter};
+pub use old_iter::{CopyableOrderedIter, CopyableNonstrictIter};
+pub use old_iter::{ExtendedMutableIter};
+pub use iter::Times;
+
+pub use num::{Num, NumCast};
+pub use num::{Orderable, Signed, Unsigned, Round};
+pub use num::{Algebraic, Trigonometric, Exponential, Hyperbolic};
+pub use num::{Integer, Fractional, Real, RealExt};
+pub use num::{Bitwise, BitCount, Bounded};
+pub use num::{Primitive, Int, Float};
+
+pub use ptr::Ptr;
+pub use from_str::FromStr;
+pub use to_str::ToStr;
+pub use clone::Clone;
+
 // On Linux, link to the runtime with -lrt.
 #[cfg(target_os = "linux")]
 #[doc(hidden)]

branches/incoming/src/libcore/either.rs

@@ -10,14 +10,11 @@
 
 //! A type that represents one of two alternatives
 
-use container::Container;
 use cmp::Eq;
 use kinds::Copy;
-use old_iter::BaseIter;
 use result::Result;
 use result;
 use vec;
-use vec::OwnedVector;
 
 /// The either type
 #[deriving(Clone, Eq)]

branches/incoming/src/libcore/hash.rs

@@ -21,8 +21,6 @@
 
 #[cfg(stage0)]
 use cast;
-use container::Container;
-use old_iter::BaseIter;
 use rt::io::Writer;
 use to_bytes::IterBytes;
 use uint;

branches/incoming/src/libcore/io.rs

@@ -16,7 +16,6 @@ Basic input/output
 
 use result::Result;
 
-use container::Container;
 use int;
 use libc;
 use libc::{c_int, c_long, c_void, size_t, ssize_t};
@@ -25,15 +24,11 @@ use os;
 use cast;
 use path::Path;
 use ops::Drop;
-use old_iter::{BaseIter, CopyableIter};
 use ptr;
 use result;
 use str;
-use str::StrSlice;
-use to_str::ToStr;
 use uint;
 use vec;
-use vec::{OwnedVector, OwnedCopyableVector};
 
 #[allow(non_camel_case_types)] // not sure what to do about this
 pub type fd_t = c_int;

branches/incoming/src/libcore/iter.rs

@@ -42,7 +42,6 @@ much easier to implement.
 
 #[cfg(not(stage0))] use cmp::Ord;
 #[cfg(not(stage0))] use option::{Option, Some, None};
-#[cfg(not(stage0))] use vec::OwnedVector;
 
 #[cfg(stage0)]
 pub trait Times {

branches/incoming/src/libcore/logging.rs

@@ -45,7 +45,6 @@ pub fn console_off() {
 #[cfg(not(test))]
 #[lang="log_type"]
 pub fn log_type<T>(level: u32, object: &T) {
-    use container::Container;
     use cast::transmute;
     use io;
     use libc;

branches/incoming/src/libcore/num/strconv.rs

@@ -8,16 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use container::Container;
 use core::cmp::{Ord, Eq};
 use ops::{Add, Sub, Mul, Div, Rem, Neg};
 use option::{None, Option, Some};
 use char;
 use str;
 use kinds::Copy;
 use vec;
-use vec::{CopyableVector, ImmutableVector};
-use vec::OwnedVector;
 use num::{NumCast, Zero, One, cast, pow_with_uint};
 use f64;
 

branches/incoming/src/libcore/option.rs

@@ -48,7 +48,6 @@ use util;
 use num::Zero;
 use old_iter::{BaseIter, MutableIter, ExtendedIter};
 use old_iter;
-use str::StrSlice;
 
 #[cfg(test)] use str;
 

branches/incoming/src/libcore/path.rs

@@ -14,16 +14,12 @@ Cross-platform file path handling
 
 */
 
-use container::Container;
 use cmp::Eq;
 use libc;
 use option::{None, Option, Some};
 use str;
-use str::StrSlice;
 use to_str::ToStr;
 use ascii::{AsciiCast, AsciiStr};
-use old_iter::BaseIter;
-use vec::OwnedVector;
 
 #[cfg(windows)]
 pub use Path = self::WindowsPath;

branches/incoming/src/libcore/pipes.rs

@@ -82,7 +82,6 @@ bounded and unbounded protocols allows for less code duplication.
 
 */
 
-use container::Container;
 use cast::{forget, transmute, transmute_copy};
 use either::{Either, Left, Right};
 use kinds::Owned;
@@ -92,10 +91,8 @@ use option::{None, Option, Some};
 use unstable::finally::Finally;
 use unstable::intrinsics;
 use ptr;
-use ptr::Ptr;
 use task;
 use vec;
-use vec::OwnedVector;
 use util::replace;
 
 static SPIN_COUNT: uint = 0;

branches/incoming/src/libcore/ptr.rs

@@ -353,7 +353,7 @@ pub mod ptr_tests {
             assert!((p.fst == 50));
             assert!((p.snd == 60));
 
-            let v0 = ~[32000u16, 32001u16, 32002u16];
+            let mut v0 = ~[32000u16, 32001u16, 32002u16];
             let mut v1 = ~[0u16, 0u16, 0u16];
 
             copy_memory(mut_offset(vec::raw::to_mut_ptr(v1), 1u),

branches/incoming/src/libcore/repr.rs

@@ -25,11 +25,10 @@ use managed;
 use ptr;
 use reflect;
 use reflect::{MovePtr, align};
-use str::StrSlice;
 use to_str::ToStr;
+use vec::UnboxedVecRepr;
 use vec::raw::{VecRepr, SliceRepr};
 use vec;
-use vec::{OwnedVector, UnboxedVecRepr};
 
 #[cfg(test)] use io;
 

branches/incoming/src/libcore/result.rs

@@ -17,9 +17,7 @@ use either;
 use either::Either;
 use kinds::Copy;
 use option::{None, Option, Some};
-use old_iter::BaseIter;
 use vec;
-use vec::OwnedVector;
 
 /// The result type
 #[deriving(Clone, Eq)]

branches/incoming/src/libcore/rt/mod.rs

@@ -13,7 +13,6 @@
 #[doc(hidden)];
 
 use libc::c_char;
-use ptr::Ptr;
 
 #[path = "sched/mod.rs"]
 mod sched;

branches/incoming/src/libcore/rt/stack.rs

@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use container::Container;
-use ptr::Ptr;
 use vec;
 
 pub struct StackSegment {

branches/incoming/src/libcore/rt/test.rs

@@ -77,7 +77,7 @@ pub fn spawntask_try(f: ~fn()) -> Result<(), ()> {
 
     // Switch to the scheduler
     let f = Cell(Cell(f));
-    let sched = local_sched::take();
+    let mut sched = local_sched::take();
     do sched.deschedule_running_task_and_then() |old_task| {
         let old_task = Cell(old_task);
         let f = f.take();

branches/incoming/src/libcore/rt/uv/mod.rs

@@ -34,13 +34,11 @@ via `close` and `delete` methods.
 
 */
 
-use container::Container;
 use option::*;
 use str::raw::from_c_str;
 use to_str::ToStr;
 use vec;
 use ptr;
-use ptr::Ptr;
 use libc::{c_void, c_int, size_t, malloc, free};
 use cast::transmute;
 use ptr::null;

branches/incoming/src/libcore/rt/uv/net.rs

@@ -388,7 +388,7 @@ fn listen() {
             assert!(status.is_none());
             let mut server_stream_watcher = server_stream_watcher;
             let mut loop_ = loop_;
-            let client_tcp_watcher = TcpWatcher::new(&mut loop_);
+            let mut client_tcp_watcher = TcpWatcher::new(&mut loop_);
             let mut client_tcp_watcher = client_tcp_watcher.as_stream();
             server_stream_watcher.accept(client_tcp_watcher);
             let count_cell = Cell(0);

branches/incoming/src/libcore/rt/uvio.rs

@@ -15,12 +15,10 @@ use super::io::net::ip::IpAddr;
 use super::uv::*;
 use super::rtio::*;
 use ops::Drop;
-use old_iter::CopyableIter;
 use cell::{Cell, empty_cell};
 use cast::transmute;
 use super::sched::{Scheduler, local_sched};
 
-#[cfg(test)] use container::Container;
 #[cfg(test)] use uint;
 #[cfg(test)] use unstable::run_in_bare_thread;
 #[cfg(test)] use super::test::*;
@@ -428,7 +426,7 @@ fn test_read_read_read() {
                 let io = local_sched::unsafe_borrow_io();
                 let mut listener = io.bind(addr).unwrap();
                 let mut stream = listener.listen().unwrap();
-                let buf = [1, .. 2048];
+                let mut buf = [1, .. 2048];
                 let mut total_bytes_written = 0;
                 while total_bytes_written < MAX {
                     stream.write(buf);

branches/incoming/src/libcore/rt/work_queue.rs

@@ -8,9 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use container::Container;
 use option::*;
-use vec::OwnedVector;
 
 pub struct WorkQueue<T> {
     priv queue: ~[T]

branches/incoming/src/libcore/run.rs

@@ -778,6 +778,7 @@ pub fn waitpid(pid: pid_t) -> int {
 
 #[cfg(test)]
 mod tests {
+    use libc;
     use option::None;
     use os;
     use run::{readclose, writeclose};

branches/incoming/src/libcore/str.rs

@@ -23,19 +23,14 @@ use cast;
 use char;
 use clone::Clone;
 use cmp::{TotalOrd, Ordering, Less, Equal, Greater};
-use container::Container;
-use iter::Times;
-use iterator::Iterator;
 use libc;
 use option::{None, Option, Some};
-use old_iter::{BaseIter, EqIter};
+use iterator::Iterator;
 use ptr;
-use ptr::Ptr;
 use str;
-use to_str::ToStr;
 use uint;
 use vec;
-use vec::{OwnedVector, OwnedCopyableVector};
+use to_str::ToStr;
 
 #[cfg(not(test))] use cmp::{Eq, Ord, Equiv, TotalEq};
 
@@ -3138,16 +3133,13 @@ impl<'self> Iterator<char> for StrCharIterator<'self> {
 
 #[cfg(test)]
 mod tests {
-    use container::Container;
     use char;
     use option::Some;
     use libc::c_char;
     use libc;
-    use old_iter::BaseIter;
     use ptr;
     use str::*;
     use vec;
-    use vec::ImmutableVector;
     use cmp::{TotalOrd, Less, Equal, Greater};
 
     #[test]

branches/incoming/src/libcore/str/ascii.rs

@@ -12,10 +12,7 @@
 
 use to_str::{ToStr,ToStrConsume};
 use str;
-use str::StrSlice;
 use cast;
-use old_iter::BaseIter;
-use vec::{CopyableVector, ImmutableVector, OwnedVector};
 
 /// Datatype to hold one ascii character. It is 8 bit long.
 #[deriving(Clone, Eq)]

branches/incoming/src/libcore/task/mod.rs

@@ -772,7 +772,7 @@ fn test_add_wrapper() {
     do b0.add_wrapper |body| {
         let ch = Cell(ch.take());
         let result: ~fn() = || {
-            let ch = ch.take();
+            let mut ch = ch.take();
             body();
             ch.send(());
         };