Merge branch 'master' of git://github.com/mozilla/rust

Author: Margaret Meyerhofer

AUTHORS.txt

@@ -27,6 +27,7 @@ Eric Holk <[email protected]>
 Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
+Gareth Daniel Smith <[email protected]>
 Grahame Bowland <[email protected]>
 Graham Fawcett <[email protected]>
 Haitao Li <[email protected]>

src/cargo/cargo.rs

@@ -18,13 +18,7 @@ import vec;
 import std::getopts;
 import getopts::{optflag, optopt, opt_present};
 
-enum _src {
-    /* Break cycles in package <-> source */
-    _source(source),
-}
-
 type package = {
-//    source: _src,
     name: str,
     uuid: str,
     url: str,
@@ -293,7 +287,6 @@ fn load_one_source_package(&src: source, p: map::hashmap<str, json::json>) {
     };
 
     vec::grow(src.packages, 1u, {
-        // source: _source(src),
         name: name,
         uuid: uuid,
         url: url,

src/fuzzer/fuzzer.rs

@@ -188,9 +188,9 @@ fn replace_expr_in_crate(crate: ast::crate, i: uint,
         }
     }
     let afp =
-        {fold_expr: fold::wrap(bind fold_expr_rep(j, i,
-                                                  newexpr.node, _, _, tm))
-         with *fold::default_ast_fold()};
+        @{fold_expr: fold::wrap(bind fold_expr_rep(j, i,
+                                                   newexpr.node, _, _, tm))
+          with *fold::default_ast_fold()};
     let af = fold::make_fold(afp);
     let crate2: @ast::crate = @af.fold_crate(crate);
     *crate2
@@ -211,8 +211,8 @@ fn replace_ty_in_crate(crate: ast::crate, i: uint, newty: ast::ty,
         } else { fold::noop_fold_ty(original, fld) }
     }
     let afp =
-        {fold_ty: fold::wrap(bind fold_ty_rep(j, i, newty.node, _, _, tm))
-            with *fold::default_ast_fold()};
+        @{fold_ty: fold::wrap(bind fold_ty_rep(j, i, newty.node, _, _, tm))
+         with *fold::default_ast_fold()};
     let af = fold::make_fold(afp);
     let crate2: @ast::crate = @af.fold_crate(crate);
     *crate2

src/libcore/core.rs

@@ -11,6 +11,7 @@ import vec_iter::extensions;
 import option::extensions;
 import option_iter::extensions;
 import ptr::extensions;
+import rand::extensions;
 
 export path, option, some, none, unreachable;
 export extensions;

src/libcore/future.rs

@@ -28,7 +28,7 @@ enum future<A> = {
 };
 
 #[doc = "Methods on the `future` type"]
-impl future<A:send> for future<A> {
+impl future<A:copy send> for future<A> {
 
     fn get() -> A {
         #[doc = "Get the value of the future"];

src/libcore/io.rs

@@ -161,6 +161,24 @@ impl reader_util for reader {
         while !self.eof() { buf += self.read_bytes(2048u); }
         buf
     }
+
+    fn each_byte(it: fn(int) -> bool) {
+        while !self.eof() {
+            if !it(self.read_byte()) { break; }
+        }
+    }
+
+    fn each_char(it: fn(char) -> bool) {
+        while !self.eof() {
+            if !it(self.read_char()) { break; }
+        }
+    }
+
+    fn each_line(it: fn(str) -> bool) {
+        while !self.eof() {
+            if !it(self.read_line()) { break; }
+        }
+    }
 }
 
 // Reader implementations