---

yaml
---
r: 22538
b: refs/heads/master
c: e993b83
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5821b9ea76428761019bf80ed540fe3922559255
+refs/heads/master: e993b838cadcef9945e0471689c6efae53d545a1
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/cargo/cargo.rs

@@ -283,7 +283,7 @@ fn load_crate(filename: str) -> option<crate> {
             ast::view_item_use(ident, metas, id) {
                 let name_items = attr::find_meta_items_by_name(metas, "name");
                 let m = if name_items.is_empty() {
-                    metas + ~[attr::mk_name_value_item_str(@"name"/~, *ident)]
+                    metas + ~[attr::mk_name_value_item_str(@"name", *ident)]
                 } else {
                     metas
                 };

trunk/src/fuzzer/fuzzer.rs

@@ -45,7 +45,7 @@ fn common_exprs() -> ~[ast::expr] {
      dse(ast::expr_again),
      dse(ast::expr_fail(option::none)),
      dse(ast::expr_fail(option::some(
-         @dse(ast::expr_lit(@dsl(ast::lit_str(@"boo"/~))))))),
+         @dse(ast::expr_lit(@dsl(ast::lit_str(@"boo"))))))),
      dse(ast::expr_ret(option::none)),
      dse(ast::expr_lit(@dsl(ast::lit_nil))),
      dse(ast::expr_lit(@dsl(ast::lit_bool(false)))),

trunk/src/libcore/dlist.rs

@@ -441,6 +441,16 @@ mod tests {
         assert iter::foldl(l, 0, |accum,elem| accum+elem) == 5050;
     }
     #[test]
+    fn test_dlist_break_early() {
+        let l = from_vec(~[1,2,3,4,5]);
+        let mut x = 0;
+        for l.each |i| {
+            x += 1;
+            if (i == 3) { break; }
+        }
+        assert x == 3;
+    }
+    #[test]
     fn test_dlist_remove_head() {
         let l = create::<int>();
         l.assert_consistent(); let one = l.push_n(1);

trunk/src/libcore/iter-trait/dlist.rs

@@ -18,7 +18,7 @@ fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
            !box::ptr_eq(*option::get(nobe.root), *self) {
             fail "Iteration encountered a dlist node not on this dlist."
         }
-        f(nobe.data);
+        if !f(nobe.data) { break; }
         // Check that the user didn't do a remove.
         // Note that this makes it ok for the user to remove the node and then
         // immediately put it back in a different position. I allow this.