---

yaml
---
r: 169891
b: refs/heads/auto
c: 1bbeb37
h: refs/heads/master
i:
  169889: 686264c
  169887: cbc2406
v: v3

Author: Jorge Aparicio

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d6a948e8f40b1d32d4760e0dfdc0c86df654cae6
+refs/heads/auto: 1bbeb375821fe197342f1e22ab53b796bb0f0c70
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/test/pretty/closure-reform-pretty.rs

@@ -15,9 +15,9 @@
 
 fn call_it(f: Box<FnMut(String) -> String>) { }
 
-fn call_this(f: |&str|: Send) { }
+fn call_this<F>(f: F) where F: Fn(&str) + Send { }
 
-fn call_that(f: <'a>|&'a int, &'a int| -> int) { }
+fn call_that<F>(f: F) where F: for<'a>Fn(&'a int, &'a int) -> int { }
 
 fn call_extern(f: fn() -> int) { }
 

branches/auto/src/test/pretty/disamb-stmt-expr.rs

@@ -14,7 +14,7 @@
 // preserved.  They are needed to disambiguate `{return n+1}; - 0` from
 // `({return n+1}-0)`.
 
-fn id(f: || -> int) -> int { f() }
+fn id<F>(f: F) -> int where F: Fn() -> int { f() }
 
 fn wsucc(_n: int) -> int { id(|| { 1 }) - 0 }
 fn main() { }

branches/auto/src/test/pretty/do1.rs

@@ -10,6 +10,6 @@
 
 // pp-exact
 
-fn f(f: |int|) { f(10) }
+fn f<F>(f: F) where F: Fn(int) { f(10) }
 
 fn main() { f(|i| { assert!(i == 10) }) }

branches/auto/src/test/pretty/fn-types.rs

@@ -11,5 +11,5 @@
 // pp-exact
 
 fn from_foreign_fn(_x: fn()) { }
-fn from_stack_closure(_x: ||) { }
+fn from_stack_closure<F>(_x: F) where F: Fn() { }
 fn main() { }