auto merge of #10572 : pcwalton/rust/more-bars, r=alexcrichton

r? @alexcrichton

Author: bors

src/test/auxiliary/cci_impl_lib.rs

@@ -11,12 +11,12 @@
 #[link(name="cci_impl_lib", vers="0.0")];
 
 trait uint_helpers {
-    fn to(&self, v: uint, f: &fn(uint));
+    fn to(&self, v: uint, f: |uint|);
 }
 
 impl uint_helpers for uint {
     #[inline]
-    fn to(&self, v: uint, f: &fn(uint)) {
+    fn to(&self, v: uint, f: |uint|) {
         let mut i = *self;
         while i < v {
             f(i);

src/test/auxiliary/cci_iter_lib.rs

@@ -11,7 +11,7 @@
 #[link(name="cci_iter_lib", vers="0.0")];
 
 #[inline]
-pub fn iter<T>(v: &[T], f: &fn(&T)) {
+pub fn iter<T>(v: &[T], f: |&T|) {
     let mut i = 0u;
     let n = v.len();
     while i < n {

src/test/auxiliary/cci_no_inline_lib.rs

@@ -11,7 +11,7 @@
 #[link(name="cci_no_inline_lib", vers="0.0")];
 
 // same as cci_iter_lib, more-or-less, but not marked inline
-pub fn iter(v: ~[uint], f: &fn(uint)) {
+pub fn iter(v: ~[uint], f: |uint|) {
     let mut i = 0u;
     let n = v.len();
     while i < n {

src/test/bench/core-map.rs

@@ -19,7 +19,7 @@ use std::trie::TrieMap;
 use std::uint;
 use std::vec;
 
-fn timed(label: &str, f: &fn()) {
+fn timed(label: &str, f: ||) {
     let start = time::precise_time_s();
     f();
     let end = time::precise_time_s();

src/test/bench/core-set.rs

@@ -27,7 +27,7 @@ struct Results {
     delete_strings: f64
 }
 
-fn timed(result: &mut f64, op: &fn()) {
+fn timed(result: &mut f64, op: ||) {
     let start = extra::time::precise_time_s();
     op();
     let end = extra::time::precise_time_s();
@@ -36,13 +36,12 @@ fn timed(result: &mut f64, op: &fn()) {
 
 impl Results {
     pub fn bench_int<T:MutableSet<uint>,
-                 R: rand::Rng>(
-                 &mut self,
-                 rng: &mut R,
-                 num_keys: uint,
-                 rand_cap: uint,
-                 f: &fn() -> T) {
-        {
+                     R: rand::Rng>(
+                     &mut self,
+                     rng: &mut R,
+                     num_keys: uint,
+                     rand_cap: uint,
+                     f: || -> T) { {
             let mut set = f();
             do timed(&mut self.sequential_ints) {
                 for i in range(0u, num_keys) {
@@ -79,11 +78,11 @@ impl Results {
     }
 
     pub fn bench_str<T:MutableSet<~str>,
-                 R:rand::Rng>(
-                 &mut self,
-                 rng: &mut R,
-                 num_keys: uint,
-                 f: &fn() -> T) {
+                     R:rand::Rng>(
+                     &mut self,
+                     rng: &mut R,
+                     num_keys: uint,
+                     f: || -> T) {
         {
             let mut set = f();
             do timed(&mut self.sequential_strings) {

src/test/bench/core-std.rs

@@ -40,7 +40,7 @@ fn main() {
     bench!(argv, is_utf8_multibyte);
 }
 
-fn maybe_run_test(argv: &[~str], name: ~str, test: &fn()) {
+fn maybe_run_test(argv: &[~str], name: ~str, test: ||) {
     let mut run_test = false;
 
     if os::getenv("RUST_BENCH").is_some() {

src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -104,8 +104,7 @@ fn update_freq(mm: &mut HashMap<~[u8], uint>, key: &[u8]) {
 // given a ~[u8], for each window call a function
 // i.e., for "hello" and windows of size four,
 // run it("hell") and it("ello"), then return "llo"
-fn windows_with_carry(bb: &[u8], nn: uint,
-                      it: &fn(window: &[u8])) -> ~[u8] {
+fn windows_with_carry(bb: &[u8], nn: uint, it: |window: &[u8]|) -> ~[u8] {
    let mut ii = 0u;
 
    let len = bb.len();

src/test/bench/shootout-k-nucleotide.rs

@@ -154,7 +154,7 @@ impl Table {
         }
     }
 
-    fn each(&self, f: &fn(entry: &Entry) -> bool) {
+    fn each(&self, f: |entry: &Entry| -> bool) {
         for self.items.each |item| {
             match *item {
                 None => {}

src/test/compile-fail/access-mode-in-closures.rs

@@ -11,7 +11,7 @@
 
 struct sty(~[int]);
 
-fn unpack(_unpack: &fn(v: &sty) -> ~[int]) {}
+fn unpack(_unpack: |v: &sty| -> ~[int]) {}
 
 fn main() {
     let _foo = unpack(|s| {

src/test/compile-fail/block-coerce-no-2.rs

@@ -15,7 +15,7 @@ fn main() {
     fn f(f: extern fn(extern fn(extern fn()))) {
     }
 
-    fn g(f: extern fn(&fn())) {
+    fn g(f: extern fn(||)) {
     }
 
     f(g);

src/test/compile-fail/block-coerce-no.rs

@@ -11,9 +11,9 @@
 // Make sure that fn-to-block coercion isn't incorrectly lifted over
 // other tycons.
 
-fn coerce(b: &fn()) -> extern fn() {
-    fn lol(f: extern fn(v: &fn()) -> extern fn(),
-           g: &fn()) -> extern fn() { return f(g); }
+fn coerce(b: ||) -> extern fn() {
+    fn lol(f: extern fn(v: ||) -> extern fn(),
+           g: ||) -> extern fn() { return f(g); }
     fn fn_id(f: extern fn()) -> extern fn() { return f }
     return lol(fn_id, b);
     //~^ ERROR mismatched types

src/test/compile-fail/borrowck-assign-comp-idx.rs

@@ -24,7 +24,7 @@ fn a() {
     info!("{}", *q);
 }
 
-fn borrow(_x: &[int], _f: &fn()) {}
+fn borrow(_x: &[int], _f: ||) {}
 
 fn b() {
     // here we alias the mutable vector into an imm slice and try to

src/test/compile-fail/borrowck-autoref-3261.rs

@@ -11,7 +11,7 @@
 struct X(Either<(uint,uint),extern fn()>);
 
 impl X {
-    pub fn with(&self, blk: &fn(x: &Either<(uint,uint),extern fn()>)) {
+    pub fn with(&self, blk: |x: &Either<(uint,uint),extern fn()>|) {
         blk(&**self)
     }
 }

src/test/compile-fail/borrowck-insert-during-each.rs

@@ -15,7 +15,7 @@ struct Foo {
 }
 
 impl Foo {
-    pub fn foo(&mut self, fun: &fn(&int)) {
+    pub fn foo(&mut self, fun: |&int|) {
         for f in self.n.iter() {
             fun(f);
         }

src/test/compile-fail/borrowck-lend-flow-if.rs

@@ -17,7 +17,7 @@
 fn borrow(_v: &int) {}
 fn borrow_mut(_v: &mut int) {}
 fn cond() -> bool { fail!() }
-fn for_func(_f: &fn() -> bool) { fail!() }
+fn for_func(_f: || -> bool) { fail!() }
 fn produce<T>() -> T { fail!(); }
 
 fn inc(v: &mut ~int) {

src/test/compile-fail/borrowck-lend-flow-loop.rs

@@ -111,7 +111,7 @@ fn while_aliased_mut_cond(cond: bool, cond2: bool) {
     }
 }
 
-fn loop_break_pops_scopes<'r>(_v: &'r mut [uint], f: &fn(&'r mut uint) -> bool) {
+fn loop_break_pops_scopes<'r>(_v: &'r mut [uint], f: |&'r mut uint| -> bool) {
     // Here we check that when you break out of an inner loop, the
     // borrows that go out of scope as you exit the inner loop are
     // removed from the bitset.
@@ -127,7 +127,7 @@ fn loop_break_pops_scopes<'r>(_v: &'r mut [uint], f: &fn(&'r mut uint) -> bool)
     }
 }
 
-fn loop_loop_pops_scopes<'r>(_v: &'r mut [uint], f: &fn(&'r mut uint) -> bool) {
+fn loop_loop_pops_scopes<'r>(_v: &'r mut [uint], f: |&'r mut uint| -> bool) {
     // Similar to `loop_break_pops_scopes` but for the `loop` keyword
 
     while cond() {

src/test/compile-fail/borrowck-lend-flow.rs

@@ -17,7 +17,7 @@
 fn borrow(_v: &int) {}
 fn borrow_mut(_v: &mut int) {}
 fn cond() -> bool { fail!() }
-fn for_func(_f: &fn() -> bool) { fail!() }
+fn for_func(_f: || -> bool) { fail!() }
 fn produce<T>() -> T { fail!(); }
 
 fn inc(v: &mut ~int) {

src/test/compile-fail/borrowck-loan-blocks-move-cc.rs

@@ -10,7 +10,7 @@
 
 use std::task;
 
-fn borrow(v: &int, f: &fn(x: &int)) {
+fn borrow(v: &int, f: |x: &int|) {
     f(v);
 }
 

src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn borrow(v: &int, f: &fn(x: &int)) {
+fn borrow(v: &int, f: |x: &int|) {
     f(v);
 }
 

src/test/compile-fail/borrowck-loan-rcvr.rs

@@ -12,14 +12,14 @@ struct point { x: int, y: int }
 
 trait methods {
     fn impurem(&self);
-    fn blockm(&self, f: &fn());
+    fn blockm(&self, f: ||);
 }
 
 impl methods for point {
     fn impurem(&self) {
     }
 
-    fn blockm(&self, f: &fn()) { f() }
+    fn blockm(&self, f: ||) { f() }
 }
 
 fn a() {

src/test/compile-fail/borrowck-loan-vec-content.rs

@@ -12,7 +12,7 @@
 // (locally rooted) mutable, unique vector, and that we then prevent
 // modifications to the contents.
 
-fn takes_imm_elt(_v: &int, f: &fn()) {
+fn takes_imm_elt(_v: &int, f: ||) {
     f();
 }
 

src/test/compile-fail/borrowck-move-in-irrefut-pat.rs

@@ -1,4 +1,4 @@
-fn with(f: &fn(&~str)) {}
+fn with(f: |&~str|) {}
 
 fn arg_item(&_x: &~str) {}
     //~^ ERROR cannot move out of dereference of & pointer

src/test/compile-fail/closure-bounds-not-builtin.rs

@@ -1,7 +1,7 @@
 
 trait Foo {}
 
-fn take(f: &fn:Foo()) {
+fn take(f: ||:Foo) {
     //~^ ERROR only the builtin traits can be used as closure or object bounds
 }
 

src/test/compile-fail/closure-bounds-static-cant-capture-borrowed.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn bar(blk: &fn:'static()) {
+fn bar(blk: ||:'static) {
 }
 
 fn foo(x: &()) {

src/test/compile-fail/closure-bounds-subtype.rs

@@ -1,15 +1,15 @@
 
-fn take_any(_: &fn:()) {
+fn take_any(_: ||:) {
 }
 
-fn take_const_owned(_: &fn:Freeze+Send()) {
+fn take_const_owned(_: ||:Freeze+Send) {
 }
 
-fn give_any(f: &fn:()) {
+fn give_any(f: ||:) {
     take_any(f);
 }
 
-fn give_owned(f: &fn:Send()) {
+fn give_owned(f: ||:Send) {
     take_any(f);
     take_const_owned(f); //~ ERROR expected bounds `Send+Freeze` but found bounds `Send`
 }

src/test/compile-fail/closure-that-fails.rs

@@ -1,4 +1,4 @@
-fn foo(f: &fn() -> !) {}
+fn foo(f: || -> !) {}
 
 fn main() {
     // Type inference didn't use to be able to handle this:

src/test/compile-fail/do2.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn f(f: &fn(int) -> bool) -> bool { f(10i) }
+fn f(f: |int| -> bool) -> bool { f(10i) }
 
 fn main() {
     assert!(do f() |i| { i == 10i } == 10i);

src/test/compile-fail/extern-wrong-value-type.rs

@@ -14,5 +14,5 @@ extern fn f() {
 fn main() {
     // extern functions are extern "C" fn
     let _x: extern "C" fn() = f; // OK
-    let _x: &fn() = f; //~ ERROR mismatched types
+    let _x: || = f; //~ ERROR mismatched types
 }

src/test/compile-fail/fn-variance-1.rs

@@ -13,7 +13,7 @@
 fn takes_mut(x: @mut int) { }
 fn takes_imm(x: @int) { }
 
-fn apply<T>(t: T, f: &fn(T)) {
+fn apply<T>(t: T, f: |T|) {
     f(t)
 }
 

src/test/compile-fail/immut-function-arguments.rs

@@ -13,7 +13,7 @@ fn f(y: ~int) {
 }
 
 fn g() {
-    let _frob: &fn(~int) = |q| { *q = 2; }; //~ ERROR cannot assign
+    let _frob: |~int| = |q| { *q = 2; }; //~ ERROR cannot assign
 
 }
 

src/test/compile-fail/issue-2074.rs

@@ -10,11 +10,11 @@
 
 // xfail-test
 fn main() {
-    let one: &fn() -> uint = || {
+    let one: || -> uint = || {
         enum r { a };
         a as uint
     };
-    let two = &fn() -> uint = || {
+    let two = || -> uint = || {
         enum r { a };
         a as uint
     };

src/test/compile-fail/issue-2149.rs

@@ -9,11 +9,11 @@
 // except according to those terms.
 
 trait vec_monad<A> {
-    fn bind<B>(&self, f: &fn(A) -> ~[B]);
+    fn bind<B>(&self, f: |A| -> ~[B]);
 }
 
 impl<A> vec_monad<A> for ~[A] {
-    fn bind<B>(&self, f: &fn(A) -> ~[B]) {
+    fn bind<B>(&self, f: |A| -> ~[B]) {
         let mut r = fail!();
         for elt in self.iter() { r = r + f(*elt); }
         //~^ ERROR the type of this value must be known

src/test/compile-fail/issue-5216.rs

@@ -9,12 +9,12 @@
 // except according to those terms.
 
 fn f() { }
-struct S(&fn()); //~ ERROR missing lifetime specifier
+struct S(||); //~ ERROR missing lifetime specifier
 pub static C: S = S(f);
 
 
 fn g() { }
-type T = &fn();  //~ ERROR missing lifetime specifier
+type T = ||;  //~ ERROR missing lifetime specifier
 pub static D: T = g;
 
 fn main() {}

src/test/compile-fail/issue-5239-1.rs

@@ -11,5 +11,5 @@
 // Regression test for issue #5239
 
 fn main() {
-    let x: &fn(int) -> int = |ref x| { x += 1; }; //~ ERROR binary operation + cannot be applied to type `&int`
+    let x: |int| -> int = |ref x| { x += 1; }; //~ ERROR binary operation + cannot be applied to type `&int`
 }