---

yaml
---
r: 50361
b: refs/heads/auto
c: f7a2371
h: refs/heads/master
i:
  50359: 3a714f0
v: v3

Author: bors

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: be57d745d2517305da4625891f08af8b3eb19042
+refs/heads/auto: f7a2371c176663d59062ec5158f39faecba45768
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/doc/tutorial-tasks.md

@@ -188,7 +188,7 @@ spawns the child task.
 
 ~~~~
 # use core::task::spawn;
-# use core::comm::stream;
+# use core::comm::{stream, Port, Chan};
 # fn some_expensive_computation() -> int { 42 }
 # let (port, chan) = stream();
 do spawn || {
@@ -208,7 +208,7 @@ computation, then waits for the child's result to arrive on the
 port:
 
 ~~~~
-# use core::comm::{stream};
+# use core::comm::{stream, Port, Chan};
 # fn some_other_expensive_computation() {}
 # let (port, chan) = stream::<int>();
 # chan.send(0);
@@ -277,7 +277,7 @@ might look like the example below.
 
 ~~~
 # use core::task::spawn;
-# use core::comm::stream;
+# use core::comm::{stream, Port, Chan};
 
 // Create a vector of ports, one for each child task
 let ports = do vec::from_fn(3) |init_val| {

branches/auto/doc/tutorial.md

@@ -875,8 +875,7 @@ the compiler that unsafety does not leak outside of the unsafe block, and is
 used to create safe concepts on top of low-level code.
 
 ~~~~
-use core::libc::funcs::c95::stdlib::{calloc, free};
-use core::libc::types::os::arch::c95::size_t;
+use core::libc::{calloc, free, size_t};
 
 fn main() {
     unsafe {
@@ -909,9 +908,7 @@ The unsafe code from above can be contained behind a safe API that prevents
 memory leaks or use-after-free:
 
 ~~~~
-use core::libc::funcs::c95::stdlib::{calloc, free};
-use core::libc::types::common::c95::c_void;
-use core::libc::types::os::arch::c95::size_t;
+use core::libc::{calloc, free, c_void, size_t};
 
 struct Blob { priv ptr: *c_void }
 
@@ -985,7 +982,9 @@ when it is collected.
 
 If an object doesn't contain garbage-collected boxes, it consists of a single
 ownership tree and is given the `Owned` trait which allows it to be sent
-between tasks.
+between tasks. Custom destructors can only be implemented directly on types
+that are `Owned`, but garbage-collected boxes can still *contain* types with
+custom destructors.
 
 # Boxes
 

branches/auto/src/compiletest/procsrv.rs

@@ -12,7 +12,7 @@ use core::prelude::*;
 
 use core::io::{ReaderUtil, WriterUtil};
 use core::io;
-use core::libc::c_int;
+use core::libc::{c_int, pid_t};
 use core::os;
 use core::run::spawn_process;
 use core::run;

branches/auto/src/libcore/cleanup.rs

@@ -11,13 +11,11 @@
 #[doc(hidden)];
 
 use libc::{c_char, c_void, intptr_t, uintptr_t};
-use ptr::mut_null;
+use ptr::{mut_null, null, to_unsafe_ptr};
 use repr::BoxRepr;
 use sys::TypeDesc;
 use cast::transmute;
 
-#[cfg(notest)] use ptr::to_unsafe_ptr;
-
 /**
  * Runtime structures
  *

branches/auto/src/libcore/comm.rs

@@ -429,7 +429,7 @@ pub fn try_send_one<T: Owned>(chan: ChanOne<T>, data: T)
 
 #[cfg(test)]
 pub mod test {
-    use either::Right;
+    use either::{Either, Left, Right};
     use super::{Chan, Port, oneshot, recv_one, stream};
 
     #[test]

branches/auto/src/libcore/gc.rs

@@ -38,7 +38,7 @@ with destructors.
 */
 
 use cast;
-use container::{Map, Set};
+use container::{Container, Mutable, Map, Set};
 use io;
 use libc::{size_t, uintptr_t};
 use option::{None, Option, Some};

branches/auto/src/libcore/hash.rs

@@ -20,7 +20,7 @@
  */
 
 use io;
-use io::Writer;
+use io::{Writer, WriterUtil};
 use to_bytes::IterBytes;
 use uint;
 use vec;

branches/auto/src/libcore/hashmap.rs

@@ -667,7 +667,7 @@ pub mod linear {
 
     #[test]
     mod test_map {
-        use container::{Container, Map, Set};
+        use container::{Container, Mutable, Map, Set};
         use option::{None, Some};
         use hashmap::linear::LinearMap;
         use hashmap::linear;
@@ -845,7 +845,7 @@ pub mod linear {
 #[test]
     mod test_set {
         use hashmap::linear;
-        use container::{Container, Map, Set};
+        use container::{Container, Mutable, Map, Set};
         use vec;
 
         #[test]

branches/auto/src/libcore/io.rs

@@ -18,7 +18,7 @@ use result::Result;
 
 use int;
 use libc;
-use libc::{c_int, c_long, c_void, size_t, ssize_t};
+use libc::{c_int, c_long, c_uint, c_void, size_t, ssize_t};
 use libc::consts::os::posix88::*;
 use os;
 use cast;

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

@@ -24,13 +24,12 @@ use f64;
 use num::NumCast;
 use num::strconv;
 use num;
-use option::Option;
+use option::{None, Option, Some};
 use to_str;
 use from_str;
 
 #[cfg(notest)] use cmp::{Eq, Ord};
 #[cfg(notest)] use ops;
-#[cfg(test)] use option::{Some, None};
 
 pub use f64::{add, sub, mul, div, rem, lt, le, eq, ne, ge, gt};
 pub use f64::logarithm;

branches/auto/src/libcore/num/num.rs

@@ -9,9 +9,9 @@
 // except according to those terms.
 
 //! An interface for numeric types
-use cmp::Ord;
-use ops::{Div, Mul, Neg};
-use option::Option;
+use cmp::{Ord, Eq};
+use ops::{Add, Div, Modulo, Mul, Neg, Sub};
+use option::{None, Option, Some};
 use kinds::Copy;
 
 pub mod strconv;

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

@@ -16,7 +16,7 @@ use from_str::FromStr;
 use num::{ToStrRadix, FromStrRadix};
 use num::strconv;
 use num;
-use option::Option;
+use option::{None, Option, Some};
 use prelude::*;
 
 #[cfg(notest)] use cmp::{Eq, Ord};

branches/auto/src/libcore/os.rs

@@ -29,7 +29,7 @@
 use cast;
 use io;
 use libc;
-use libc::{c_char, c_void, c_int, size_t};
+use libc::{c_char, c_void, c_int, c_uint, size_t, ssize_t};
 use libc::{mode_t, pid_t, FILE};
 use option;
 use option::{Some, None};
@@ -397,7 +397,7 @@ pub fn pipe() -> Pipe {
         // first, as in rust_run_program.
         let mut fds = Pipe {in: 0 as c_int,
                     out: 0 as c_int };
-        let res = libc::pipe(&mut fds.in, 1024 as ::libc::c_uint,
+        let res = libc::pipe(&mut fds.in, 1024 as c_uint,
                              (libc::O_BINARY | libc::O_NOINHERIT) as c_int);
         fail_unless!((res == 0 as c_int));
         fail_unless!((fds.in != -1 as c_int && fds.in != 0 as c_int));
@@ -431,7 +431,7 @@ pub fn self_exe_path() -> Option<Path> {
                            KERN_PROC as c_int,
                            KERN_PROC_PATHNAME as c_int, -1 as c_int];
                 let mut sz = sz;
-                sysctl(vec::raw::to_ptr(mib), vec::len(mib) as ::libc::c_uint,
+                sysctl(vec::raw::to_ptr(mib), vec::len(mib) as c_uint,
                        buf as *mut c_void, &mut sz, ptr::null(),
                        0u as size_t) == (0 as c_int)
             }
@@ -670,7 +670,7 @@ pub fn list_dir(p: &Path) -> ~[~str] {
         #[cfg(target_os = "freebsd")]
         #[cfg(target_os = "macos")]
         unsafe fn get_list(p: &Path) -> ~[~str] {
-            use libc::{dirent_t};
+            use libc::{DIR, dirent_t};
             use libc::{opendir, readdir, closedir};
             extern mod rustrt {
                 unsafe fn rust_list_dir_val(ptr: *dirent_t)
@@ -1257,7 +1257,7 @@ pub mod consts {
 mod tests {
     use libc::{c_int, c_void, size_t};
     use libc;
-    use option::Some;
+    use option::{None, Option, Some};
     use option;
     use os::{as_c_charp, env, getcwd, getenv, make_absolute, real_args};
     use os::{remove_file, setenv};

branches/auto/src/libcore/pipes.rs

@@ -958,9 +958,9 @@ pub mod rt {
 
 #[cfg(test)]
 pub mod test {
-    use either::Right;
+    use either::{Either, Left, Right};
     use comm::{Chan, Port, oneshot, recv_one, stream, Select2,
-               GenericChan, Peekable};
+               GenericPort, GenericChan, Peekable};
 
     #[test]
     pub fn test_select2() {

branches/auto/src/libcore/ptr.rs

@@ -13,6 +13,7 @@
 use cast;
 use libc;
 use libc::{c_void, size_t};
+use unstable::intrinsics::{memmove32,memmove64};
 use sys;
 
 #[cfg(test)] use vec;
@@ -115,14 +116,12 @@ pub fn is_not_null<T>(ptr: *const T) -> bool { !is_null(ptr) }
 #[inline(always)]
 #[cfg(target_word_size = "32")]
 pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
-    use unstable::intrinsics::memmove32;
     let n = count * sys::size_of::<T>();
     memmove32(dst as *mut u8, src as *u8, n as u32);
 }
 #[inline(always)]
 #[cfg(target_word_size = "64")]
 pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
-    use unstable::intrinsics::memmove64;
     let n = count * sys::size_of::<T>();
     memmove64(dst as *mut u8, src as *u8, n as u64);
 }

branches/auto/src/libcore/rand.rs

@@ -574,7 +574,7 @@ pub fn random() -> uint {
 
 #[cfg(test)]
 pub mod tests {
-    use option::{Option, Some};
+    use option::{None, Option, Some};
     use rand;
 
     #[test]

branches/auto/src/libcore/reflect.rs

@@ -14,7 +14,7 @@ Runtime type reflection
 
 */
 
-use intrinsic::{TyDesc, TyVisitor};
+use intrinsic::{TyDesc, get_tydesc, visit_tydesc, TyVisitor};
 use libc::c_void;
 use sys;
 use vec;

branches/auto/src/libcore/repr.rs

@@ -23,7 +23,7 @@ use libc::c_void;
 use managed;
 use ptr;
 use reflect;
-use reflect::{MovePtr, align};
+use reflect::{MovePtr, MovePtrAdaptor, align};
 use sys;
 use to_str::ToStr;
 use vec::UnboxedVecRepr;

branches/auto/src/libcore/rt/io/file.rs

@@ -9,6 +9,8 @@
 // except according to those terms.
 
 use prelude::*;
+use super::super::sched::*;
+use super::super::rtio::*;
 use super::Stream;
 
 pub struct FileStream;

branches/auto/src/libcore/rt/thread_local_storage.rs

@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use libc::c_void;
+use libc::{c_void};
 #[cfg(unix)]
-use libc::c_int;
+use libc::{c_uint, c_ulong, c_int};
 #[cfg(unix)]
 use ptr::null;
 #[cfg(windows)]
@@ -36,13 +36,13 @@ pub unsafe fn get(key: Key) -> *mut c_void {
 
 #[cfg(target_os="macos")]
 #[allow(non_camel_case_types)] // foreign type
-type pthread_key_t = ::libc::c_ulong;
+type pthread_key_t = c_ulong;
 
 #[cfg(target_os="linux")]
 #[cfg(target_os="freebsd")]
 #[cfg(target_os="android")]
 #[allow(non_camel_case_types)] // foreign type
-type pthread_key_t = ::libc::c_uint;
+type pthread_key_t = c_uint;
 
 #[cfg(unix)]
 extern {

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

@@ -39,13 +39,16 @@ use str::raw::from_c_str;
 use to_str::ToStr;
 use vec;
 use ptr;
-use libc::{c_void, c_int, size_t, malloc, free};
-use cast::transmute;
+use libc::{c_void, c_int, size_t, malloc, free, ssize_t};
+use cast::{transmute, transmute_mut_region};
 use ptr::null;
 use super::uvll;
+use super::uvll::*;
 use unstable::finally::Finally;
 
 #[cfg(test)] use unstable::run_in_bare_thread;
+#[cfg(test)] use super::thread::Thread;
+#[cfg(test)] use cell::Cell;
 
 pub use self::file::{FsRequest, FsCallback};
 pub use self::net::{StreamWatcher, TcpWatcher};

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

@@ -10,7 +10,7 @@
 
 use prelude::*;
 use libc::{size_t, ssize_t, c_int, c_void};
-use cast::transmute_mut_region;
+use cast::{transmute, transmute_mut_region};
 use super::super::uvll;
 use super::super::uvll::*;
 use super::{Loop, Watcher, Request, UvError, Buf, Callback, NativeHandle, NullCallback,

branches/auto/src/libcore/run.rs

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

branches/auto/src/libcore/str.rs

@@ -21,7 +21,7 @@ use at_vec;
 use cast;
 use char;
 use clone::Clone;
-use cmp::{TotalOrd, Ordering, Less, Equal, Greater};
+use cmp::{Equiv, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use libc;
 use option::{None, Option, Some};
 use ptr;
@@ -31,7 +31,7 @@ use uint;
 use vec;
 use to_str::ToStr;
 
-#[cfg(notest)] use cmp::{Eq, Ord, Equiv, TotalEq};
+#[cfg(notest)] use cmp::{Eq, Ord};
 
 /*
 Section: Creating a string

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

@@ -36,15 +36,13 @@
 use cell::Cell;
 use cmp::Eq;
 use result::Result;
-use comm::{stream, Chan, GenericChan, GenericPort, Port};
+use comm::{stream, Chan, GenericChan, GenericPort, Port, SharedChan};
 use prelude::*;
 use result;
 use task::rt::{task_id, sched_id, rust_task};
 use util;
 use util::replace;
 
-#[cfg(test)] use comm::SharedChan;
-
 mod local_data_priv;
 pub mod local_data;
 pub mod rt;