---

yaml
---
r: 140619
b: refs/heads/try2
c: d20e63a
h: refs/heads/master
i:
  140617: 6f5c845
  140615: 36101b6
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: 85d9409b206284847bec802866ad85234f7d8e25
+refs/heads/try2: d20e63ab65f7ba28db36ae43379706ca9dba1ca5
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/bench/graph500-bfs.rs

@@ -273,7 +273,7 @@ fn pbfs(graph: &arc::ARC<graph>, key: node_id) -> bfs_result {
         colors = do par::mapi(*color_vec) {
             let colors = arc::clone(&color);
             let graph = arc::clone(graph);
-            let result: ~fn(+x: uint, +y: &color) -> color = |i, c| {
+            let result: ~fn(x: uint, y: &color) -> color = |i, c| {
                 let colors = arc::get(&colors);
                 let graph = arc::get(&graph);
                 match *c {
@@ -395,7 +395,7 @@ fn validate(edges: ~[(node_id, node_id)],
 
     let status = do par::alli(tree) {
         let edges = copy edges;
-        let result: ~fn(+x: uint, v: &i64) -> bool = |u, v| {
+        let result: ~fn(x: uint, v: &i64) -> bool = |u, v| {
             let u = u as node_id;
             if *v == -1i64 || u == root {
                 true

branches/try2/src/test/bench/msgsend-ring-mutex-arcs.rs

@@ -45,10 +45,7 @@ fn init() -> (pipe,pipe) {
 }
 
 
-fn thread_ring(i: uint,
-               count: uint,
-               +num_chan: pipe,
-               +num_port: pipe) {
+fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) {
     let mut num_chan = Some(num_chan);
     let mut num_port = Some(num_port);
     // Send/Receive lots of messages.

branches/try2/src/test/bench/msgsend-ring-pipes.rs

@@ -35,8 +35,8 @@ macro_rules! move_out (
 
 fn thread_ring(i: uint,
                count: uint,
-               +num_chan: ring::client::num,
-               +num_port: ring::server::num) {
+               num_chan: ring::client::num,
+               num_port: ring::server::num) {
     let mut num_chan = Some(num_chan);
     let mut num_port = Some(num_port);
     // Send/Receive lots of messages.

branches/try2/src/test/bench/msgsend-ring-rw-arcs.rs

@@ -46,10 +46,7 @@ fn init() -> (pipe,pipe) {
 }
 
 
-fn thread_ring(i: uint,
-               count: uint,
-               +num_chan: pipe,
-               +num_port: pipe) {
+fn thread_ring(i: uint, count: uint, num_chan: pipe, num_port: pipe) {
     let mut num_chan = Some(num_chan);
     let mut num_port = Some(num_port);
     // Send/Receive lots of messages.

branches/try2/src/test/bench/pingpong.rs

@@ -117,8 +117,9 @@ pub fn spawn_service_recv<T:Owned,Tb:Owned>(
     client
 }
 
-fn switch<T:Owned,Tb:Owned,U>(+endp: core::pipes::RecvPacketBuffered<T, Tb>,
-                      f: &fn(+v: Option<T>) -> U) -> U {
+fn switch<T:Owned,Tb:Owned,U>(endp: core::pipes::RecvPacketBuffered<T, Tb>,
+                              f: &fn(v: Option<T>) -> U)
+                              -> U {
     f(core::pipes::try_recv(endp))
 }
 

branches/try2/src/test/bench/shootout-pfib.rs

@@ -66,7 +66,7 @@ fn parse_opts(argv: ~[~str]) -> Config {
     }
 }
 
-fn stress_task(&&id: int) {
+fn stress_task(id: int) {
     let mut i = 0;
     loop {
         let n = 15;

branches/try2/src/test/bench/task-perf-linked-failure.rs

@@ -46,7 +46,7 @@ fn grandchild_group(num_tasks: uint) {
     // Master grandchild task exits early.
 }
 
-fn spawn_supervised_blocking(myname: &str, +f: ~fn()) {
+fn spawn_supervised_blocking(myname: &str, f: ~fn()) {
     let mut res = None;
     let mut builder = task::task();
     builder.future_result(|r| res = Some(r));

branches/try2/src/test/bench/task-perf-spawnalot.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn f(&&n: uint) {
+fn f(n: uint) {
     let mut i = 0u;
     while i < n {
         task::try(|| g() );