---

yaml
---
r: 50391
b: refs/heads/auto
c: 85ed840
h: refs/heads/master
i:
  50389: 7380721
  50387: 57b4dca
  50383: cc6451b
v: v3

Author: thestinger

[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: 0a5e522acd7d3e95efa15315ddb6ad4853cdd2a9
+refs/heads/auto: 85ed840e234184b7975d9ee7b022c0ca2cb5d8ff
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/configure

@@ -881,10 +881,6 @@ do
                 ;;
         esac
         need_ok "LLVM configure failed"
-
-        # Hack the tools Makefile to turn off the clang build
-        sed -i 's/clang//g' tools/Makefile
-
         cd $CFG_BUILD_DIR
     fi
 

branches/auto/doc/rust.md

@@ -125,7 +125,7 @@ but a small number are defined in terms of Unicode properties or explicit codepo
 ## Special Unicode Productions
 
 The following productions in the Rust grammar are defined in terms of Unicode properties:
-`ident`, `non_null`, `non_star`, `non_eol`, `non_slash_or_star`, `non_single_quote` and `non_double_quote`.
+`ident`, `non_null`, `non_star`, `non_eol`, `non_slash`, `non_single_quote` and `non_double_quote`.
 
 ### Identifiers
 
@@ -147,16 +147,16 @@ Some productions are defined by exclusion of particular Unicode characters:
   - `non_null` is any single Unicode character aside from `U+0000` (null)
   - `non_eol` is `non_null` restricted to exclude `U+000A` (`'\n'`)
   - `non_star` is `non_null` restricted to exclude `U+002A` (`*`)
-  - `non_slash_or_star` is `non_null` restricted to exclude `U+002F` (`/`) and `U+002A` (`*`)
+  - `non_slash` is `non_null` restricted to exclude `U+002F` (`/`)
   - `non_single_quote` is `non_null` restricted to exclude `U+0027`  (`'`)
   - `non_double_quote` is `non_null` restricted to exclude `U+0022` (`"`)
 
 ## Comments
 
 ~~~~~~~~ {.ebnf .gram}
 comment : block_comment | line_comment ;
-block_comment : "/*" block_comment_body * '*' + '/' ;
-block_comment_body : non_star * | '*' + non_slash_or_star ;
+block_comment : "/*" block_comment_body * "*/" ;
+block_comment_body : non_star * | '*' non_slash ;
 line_comment : "//" non_eol * ;
 ~~~~~~~~
 

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

@@ -1002,11 +1002,46 @@ refer to that through a pointer.
 
 ## Owned boxes
 
-An owned box (`~`) is a uniquely owned allocation on the heap. An owned box
-inherits the mutability and lifetime of the owner as it would if there was no
-box. The purpose of an owned box is to add a layer of indirection in order to
-create recursive data structures or cheaply pass around an object larger than a
-pointer.
+An owned box (`~`) is a uniquely owned allocation on the heap. It inherits the
+mutability and lifetime of the owner as it would if there was no box.
+
+~~~~
+let x = 5; // immutable
+let mut y = 5; // mutable
+y += 2;
+
+let x = ~5; // immutable
+let mut y = ~5; // mutable
+*y += 2; // the * operator is needed to access the contained value
+~~~~
+
+The purpose of an owned box is to add a layer of indirection in order to create
+recursive data structures or cheaply pass around an object larger than a
+pointer. Since an owned box has a unique owner, it can be used to represent any
+tree data structure.
+
+The following struct won't compile, because the lack of indirection would mean
+it has an infinite size:
+
+~~~~ {.xfail-test}
+struct Foo {
+    child: Option<Foo>
+}
+~~~~
+
+> ***Note:*** The `Option` type is an enum that represents an *optional* value.
+> It's comparable to a nullable pointer in many other languages, but stores the
+> contained value unboxed.
+
+Adding indirection with an owned pointer allocates the child outside of the
+struct on the heap, which makes it a finite size and won't result in a
+compile-time error:
+
+~~~~
+struct Foo {
+    child: Option<~Foo>
+}
+~~~~
 
 ## Managed boxes
 
@@ -1035,10 +1070,10 @@ let z = x; // no new memory allocated, x can no longer be used
 # Borrowed pointers
 
 Rust's borrowed pointers are a general purpose reference type. In contrast with
-owned pointers, where the holder of an owned pointer is the owner of the
-pointed-to memory, borrowed pointers never imply ownership. A pointer can be
-borrowed to any object, and the compiler verifies that it cannot outlive the
-lifetime of the object.
+owned boxes, where the holder of an owned box is the owner of the pointed-to
+memory, borrowed pointers never imply ownership. A pointer can be borrowed to
+any object, and the compiler verifies that it cannot outlive the lifetime of
+the object.
 
 As an example, consider a simple struct type, `Point`:
 

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/prelude.rs

@@ -21,10 +21,6 @@ pub use ops::{Shl, Shr, Index};
 pub use option::{Option, Some, None};
 pub use result::{Result, Ok, Err};
 
-/* Reexported functions */
-
-pub use io::{print, println};
-
 /* Reexported types and traits */
 
 pub use clone::Clone;

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/context.rs

@@ -160,7 +160,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp:
 type Registers = [uint, ..32];
 
 #[cfg(target_arch = "arm")]
-fn new_regs() -> ~Registers { ~([0, .. 32]) }
+fn new_regs() -> ~Registers { ~[0, .. 32] }
 
 #[cfg(target_arch = "arm")]
 fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {
@@ -178,7 +178,7 @@ fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp:
 type Registers = [uint, ..32];
 
 #[cfg(target_arch = "mips")]
-fn new_regs() -> ~Registers { ~([0, .. 32]) }
+fn new_regs() -> ~Registers { ~[0, .. 32] }
 
 #[cfg(target_arch = "mips")]
 fn initialize_call_frame(regs: &mut Registers, fptr: *c_void, arg: *c_void, sp: *mut uint) {