---

yaml
---
r: 93694
b: refs/heads/try
c: 74d2731
h: refs/heads/master
v: v3

Author: TeXitoi

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 89a9ce0cc6ecd8c1369bede6916ef9e27bcc0ee8
+refs/heads/try: 74d27311a7ecb50b4783b6adc4a977a6e51759b2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/test/bench/shootout-meteor.rs

@@ -14,18 +14,13 @@
 
 // returns an infinite iterator of repeated applications of f to x,
 // i.e. [x, f(x), f(f(x)), ...], as haskell iterate function.
-fn iterate<'a, T>(f: &'a fn(&T) -> T, x: T) -> Iterate<'a, T> {
-    Iterate::new(f, x)
+fn iterate<'a, T>(x: T, f: &'a fn(&T) -> T) -> Iterate<'a, T> {
+    Iterate {f: f, next: x}
 }
 struct Iterate<'self, T> {
     priv f: &'self fn(&T) -> T,
     priv next: T
 }
-impl<'self, T> Iterate<'self, T> {
-    fn new<'a>(f: &'a fn(&T) -> T, x: T) -> Iterate<'a, T> {
-        Iterate {f: f, next: x}
-    }
-}
 impl<'self, T> Iterator<T> for Iterate<'self, T> {
     fn next(&mut self) -> Option<T> {
         let mut res = (self.f)(&self.next);
@@ -71,11 +66,11 @@ impl<'self, T> Iterator<&'self T> for ListIterator<'self, T> {
 fn transform(p: ~[(int, int)], all: bool) -> ~[~[(int, int)]] {
     let mut res =
         // rotations
-        iterate(|p| p.iter().map(|&(y, x)| (x + y, -y)).collect(), p)
+        iterate(p, |p| p.iter().map(|&(y, x)| (x + y, -y)).collect())
         .take(if all {6} else {3})
         // mirror
         .flat_map(|p| {
-            iterate(|p| p.iter().map(|&(y, x)| (x, y)).collect(), p).take(2)
+            iterate(p, |p| p.iter().map(|&(y, x)| (x, y)).collect()).take(2)
         }).to_owned_vec();
 
     // translating to (0, 0) as minimum coordinates.