---

yaml
---
r: 63600
b: refs/heads/snap-stage3
c: 3b1ace9
h: refs/heads/master
v: v3

Author: Thiez

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a4a8a4ac277f686a4d771f1a8ce5a55b27eddf5c
+refs/heads/snap-stage3: 3b1ace9f9b07d59804fab1abc02ddf20b1496666
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/bench/shootout-binarytrees.rs

@@ -1,8 +1,4 @@
-// xfail-test
-
-// Broken due to arena API problems.
-
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -15,29 +11,29 @@
 extern mod extra;
 use extra::arena;
 
-enum tree<'self> {
-    nil,
-    node(&'self tree<'self>, &'self tree<'self>, int),
+enum Tree<'self> {
+    Nil,
+    Node(&'self Tree<'self>, &'self Tree<'self>, int),
 }
 
-fn item_check(t: &tree) -> int {
+fn item_check(t: &Tree) -> int {
     match *t {
-      nil => { return 0; }
-      node(left, right, item) => {
+      Nil => { return 0; }
+      Node(left, right, item) => {
         return item + item_check(left) - item_check(right);
       }
     }
 }
 
-fn bottom_up_tree<'r>(arena: &'r mut arena::Arena, item: int, depth: int)
-                   -> &'r tree<'r> {
+fn bottom_up_tree<'r>(arena: &'r arena::Arena, item: int, depth: int)
+                   -> &'r Tree<'r> {
     if depth > 0 {
         return arena.alloc(
-            || node(bottom_up_tree(arena, 2 * item - 1, depth - 1),
+            || Node(bottom_up_tree(arena, 2 * item - 1, depth - 1),
                     bottom_up_tree(arena, 2 * item, depth - 1),
                     item));
     }
-    return arena.alloc(|| nil);
+    return arena.alloc(|| Nil);
 }
 
 fn main() {
@@ -61,25 +57,25 @@ fn main() {
         max_depth = n;
     }
 
-    let mut stretch_arena = arena::Arena();
+    let stretch_arena = arena::Arena();
     let stretch_depth = max_depth + 1;
-    let stretch_tree = bottom_up_tree(&mut stretch_arena, 0, stretch_depth);
+    let stretch_tree = bottom_up_tree(&stretch_arena, 0, stretch_depth);
 
     println(fmt!("stretch tree of depth %d\t check: %d",
                           stretch_depth,
                           item_check(stretch_tree)));
 
-    let mut long_lived_arena = arena::Arena();
-    let long_lived_tree = bottom_up_tree(&mut long_lived_arena, 0, max_depth);
+    let long_lived_arena = arena::Arena();
+    let long_lived_tree = bottom_up_tree(&long_lived_arena, 0, max_depth);
     let mut depth = min_depth;
     while depth <= max_depth {
         let iterations = int::pow(2, (max_depth - depth + min_depth) as uint);
         let mut chk = 0;
         let mut i = 1;
         while i <= iterations {
-            let mut temp_tree = bottom_up_tree(&mut long_lived_arena, i, depth);
+            let mut temp_tree = bottom_up_tree(&long_lived_arena, i, depth);
             chk += item_check(temp_tree);
-            temp_tree = bottom_up_tree(&mut long_lived_arena, -i, depth);
+            temp_tree = bottom_up_tree(&long_lived_arena, -i, depth);
             chk += item_check(temp_tree);
             i += 1;
         }