---

yaml
---
r: 46877
b: refs/heads/auto
c: 98ce99d
h: refs/heads/master
i:
  46875: 1a8da0d
v: v3

Author: bors

[refs]

@@ -14,4 +14,4 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 06a336ae791ea8a8e618ff43a97b1e6e510c6601
+refs/heads/auto: 98ce99d500b13c79fd8e74e807167d8a59caf0e7

branches/auto/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/auto/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)) }
 }