---

yaml
---
r: 31653
b: refs/heads/dist-snap
c: a52f6d2
h: refs/heads/master
i:
  31651: b8c7a1e
v: v3

Author: brson

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: a60f9c76f5b5ce503b479227a55b10ad65598e80
+refs/heads/dist-snap: a52f6d26db810b947f5ff515ffae18a31e9479c0
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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