]> git.lizzy.rs Git - rust.git/commitdiff
Merge branch 'vector-reform' into incoming
authorMichael Sullivan <sully@msully.net>
Sat, 14 Jul 2012 08:03:54 +0000 (01:03 -0700)
committerMichael Sullivan <sully@msully.net>
Sat, 14 Jul 2012 08:03:54 +0000 (01:03 -0700)
1  2 
src/libcore/dlist.rs
src/libcore/iter-trait/dlist.rs
src/libcore/task.rs
src/rustc/middle/typeck/collect.rs

Simple merge
index b1a822a5bad1a8a9f760c796ae26fae28ea4aa6e,937063232463b8216a50d474b533e2d81cb8e7c5..e00e51b494116379b2507d81becf136c91a5a34e
@@@ -16,9 -16,9 +16,9 @@@ fn EACH<A>(self: IMPL_T<A>, f: fn(A) -
          // Check dlist invariant.
          if !option::is_some(nobe.root) ||
             !box::ptr_eq(*option::get(nobe.root), *self) {
-             fail "Iteration encountered a dlist node not on this dlist."
+             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.
Simple merge
Simple merge