---

yaml
---
r: 20883
b: refs/heads/snap-stage3
c: a52f6d2
h: refs/heads/master
i:
  20881: 08eb5cd
  20879: 2dc66ff
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a60f9c76f5b5ce503b479227a55b10ad65598e80
+refs/heads/snap-stage3: a52f6d26db810b947f5ff515ffae18a31e9479c0
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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() { }

branches/snap-stage3/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~()) { }