---

yaml
---
r: 12950
b: refs/heads/master
c: 6077647
h: refs/heads/master
v: v3

Author: Margaret Meyerhofer

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a32392d032435bf3cf05d2c70671f5076b4da3ee
+refs/heads/master: 6077647878beb8e1df08772a001616b6d4957092
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/AUTHORS.txt

@@ -27,7 +27,6 @@ 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]>

trunk/src/cargo/cargo.rs

@@ -18,7 +18,13 @@ 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,
@@ -287,6 +293,7 @@ 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,

trunk/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

trunk/src/libcore/core.rs

@@ -11,7 +11,6 @@ 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;

trunk/src/libcore/future.rs

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

trunk/src/libcore/io.rs

@@ -161,24 +161,6 @@ 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