Merge remote-tracking branch 'remotes/origin/incoming' into serial

Author: erickt

doc/tutorial-tasks.md

@@ -188,7 +188,7 @@ spawns the child task.
 
 ~~~~
 # use core::task::spawn;
-# use core::comm::{stream, Port, Chan};
+# use core::comm::stream;
 # 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, Port, Chan};
+# use core::comm::{stream};
 # 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, Port, Chan};
+# use core::comm::stream;
 
 // Create a vector of ports, one for each child task
 let ports = do vec::from_fn(3) |init_val| {

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
 

src/compiletest/procsrv.rs

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

src/libcore/cleanup.rs

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

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::{Either, Left, Right};
+    use either::Right;
     use super::{Chan, Port, oneshot, recv_one, stream};
 
     #[test]

src/libcore/gc.rs

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

src/libcore/hash.rs

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

src/libcore/hashmap.rs

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

src/libcore/io.rs

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

src/libcore/num/float.rs

@@ -24,12 +24,13 @@ use f64;
 use num::NumCast;
 use num::strconv;
 use num;
-use option::{None, Option, Some};
+use option::Option;
 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;