---

yaml
---
r: 22991
b: refs/heads/master
c: a52f6d2
h: refs/heads/master
i:
  22989: 431ab88
  22987: 05af29d
  22983: 977f6e9
  22975: 1a5496a
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a60f9c76f5b5ce503b479227a55b10ad65598e80
+refs/heads/master: a52f6d26db810b947f5ff515ffae18a31e9479c0
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/pretty/disamb-stmt-expr.rs

@@ -4,7 +4,7 @@
 // preserved.  They are needed to disambiguate `{return n+1}; - 0` from
 // `({return n+1}-0)`.
 
-fn id(f: fn() -> int) -> int { f() }
+fn id(f: fn&() -> int) -> int { f() }
 
 fn wsucc(n: int) -> int { (do id || { 1 }) - 0 }
 fn main() { }

trunk/src/test/pretty/fn-types.rs

@@ -1,7 +1,6 @@
 // pp-exact
 
 fn from_foreign_fn(x: extern fn()) { }
-fn from_closure(x: fn()) { }
 fn from_stack_closure(x: fn&()) { }
 fn from_box_closure(x: fn@()) { }
 fn from_unique_closure(x: fn~()) { }