---

yaml
---
r: 140762
b: refs/heads/try2
c: 58a37a1
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: db0693ac8d06202a289f451c223eb6f514819ffe
+refs/heads/try2: 58a37a1f485a738f6802b42dd39437618b18bbae
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/old_iter.rs

@@ -128,26 +128,30 @@ pub fn _eachi<A,IA:BaseIter<A>>(this: &IA, blk: &fn(uint, &A) -> bool) -> bool {
 }
 
 #[cfg(stage0)]
-pub fn eachi<A,IA:BaseIter<A>>(self: &IA, blk: &fn(uint, &A) -> bool) {
-    _eachi(self, blk);
+pub fn eachi<A,IA:BaseIter<A>>(this: &IA, blk: &fn(uint, &A) -> bool) {
+    _eachi(this, blk);
 }
 #[cfg(not(stage0))]
-pub fn eachi<A,IA:BaseIter<A>>(self: &IA, blk: &fn(uint, &A) -> bool) -> bool {
-    _eachi(self, blk)
+pub fn eachi<A,IA:BaseIter<A>>(this: &IA, blk: &fn(uint, &A) -> bool) -> bool {
+    _eachi(this, blk)
 }
 
 #[inline(always)]
 pub fn all<A,IA:BaseIter<A>>(this: &IA, blk: &fn(&A) -> bool) -> bool {
     for this.each |a| {
-        if !blk(a) { return false; }
+        if !blk(a) {
+            return false;
+        }
     }
     return true;
 }
 
 #[inline(always)]
 pub fn any<A,IA:BaseIter<A>>(this: &IA, blk: &fn(&A) -> bool) -> bool {
     for this.each |a| {
-        if blk(a) { return true; }
+        if blk(a) {
+            return true;
+        }
     }
     return false;
 }

branches/try2/src/libstd/priority_queue.rs

@@ -153,7 +153,7 @@ pub impl <T:Ord> PriorityQueue<T> {
             while pos > start {
                 let parent = (pos - 1) >> 1;
                 if new > self.data[parent] {
-                    let x = replace(&mut self.data[parent], rusti::uninit());
+                    let x = replace(&mut self.data[parent], uninit());
                     move_val_init(&mut self.data[pos], x);
                     pos = parent;
                     loop
@@ -172,7 +172,7 @@ pub impl <T:Ord> PriorityQueue<T> {
             while pos > start {
                 let parent = (pos - 1) >> 1;
                 if new > self.data[parent] {
-                    let x = replace(&mut self.data[parent], rusti::init());
+                    let x = replace(&mut self.data[parent], init());
                     move_val_init(&mut self.data[pos], x);
                     pos = parent;
                     loop
@@ -196,7 +196,7 @@ pub impl <T:Ord> PriorityQueue<T> {
                 if right < end && !(self.data[child] > self.data[right]) {
                     child = right;
                 }
-                let x = replace(&mut self.data[child], rusti::uninit());
+                let x = replace(&mut self.data[child], uninit());
                 move_val_init(&mut self.data[pos], x);
                 pos = child;
                 child = 2 * pos + 1;
@@ -219,7 +219,7 @@ pub impl <T:Ord> PriorityQueue<T> {
                 if right < end && !(self.data[child] > self.data[right]) {
                     child = right;
                 }
-                let x = replace(&mut self.data[child], rusti::init());
+                let x = replace(&mut self.data[child], init());
                 move_val_init(&mut self.data[pos], x);
                 pos = child;
                 child = 2 * pos + 1;