---

yaml
---
r: 48586
b: refs/heads/snap-stage3
c: 98ce99d
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 06a336ae791ea8a8e618ff43a97b1e6e510c6601
+refs/heads/snap-stage3: 98ce99d500b13c79fd8e74e807167d8a59caf0e7
 refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/etc/kate/rust.xml

@@ -17,7 +17,6 @@
 	</list>
 	<list name="keywords">
 		<item> as </item>
-		<item> assert </item>
 		<item> break </item>
 		<item> const </item>
 		<item> copy </item>
@@ -69,6 +68,7 @@
 		<item> Shl </item>
 		<item> Shr </item>
 		<item> Index </item>
+		<item> Not </item>
 	</list>
 	<list name="types">
 		<item> bool </item>

branches/snap-stage3/src/libcore/vec.rs

@@ -2268,27 +2268,45 @@ pub mod bytes {
 
 // ___________________________________________________________________________
 // ITERATION TRAIT METHODS
+//
+// This cannot be used with iter-trait.rs because of the region pointer
+// required in the slice.
 
 impl<A> iter::BaseIter<A> for &self/[A] {
-    #[inline(always)]
-    pure fn each(&self, blk: fn(v: &'self A) -> bool) { each(*self, blk) }
-    #[inline(always)]
+    pub pure fn each(&self, blk: fn(v: &A) -> bool) {
+        // FIXME(#2263)---should be able to call each(self, blk)
+        for each(*self) |e| {
+            if (!blk(e)) {
+                return;
+            }
+        }
+    }
     pure fn size_hint(&self) -> Option<uint> { Some(len(*self)) }
 }
 
 // FIXME(#4148): This should be redundant
 impl<A> iter::BaseIter<A> for ~[A] {
-    #[inline(always)]
-    pure fn each(&self, blk: fn(v: &'self A) -> bool) { each(*self, blk) }
-    #[inline(always)]
+    pub pure fn each(&self, blk: fn(v: &A) -> bool) {
+        // FIXME(#2263)---should be able to call each(self, blk)
+        for each(*self) |e| {
+            if (!blk(e)) {
+                return;
+            }
+        }
+    }
     pure fn size_hint(&self) -> Option<uint> { Some(len(*self)) }
 }
 
 // FIXME(#4148): This should be redundant
 impl<A> iter::BaseIter<A> for @[A] {
-    #[inline(always)]
-    pure fn each(&self, blk: fn(v: &'self A) -> bool) { each(*self, blk) }
-    #[inline(always)]
+    pub pure fn each(&self, blk: fn(v: &A) -> bool) {
+        // FIXME(#2263)---should be able to call each(self, blk)
+        for each(*self) |e| {
+            if (!blk(e)) {
+                return;
+            }
+        }
+    }
     pure fn size_hint(&self) -> Option<uint> { Some(len(*self)) }
 }