fix pretty tests

diff --git a/src/test/pretty/closure-reform-pretty.rs b/src/test/pretty/closure-reform-pretty.rs
index 328d4245eb61011acc5edbff4e2998a7356c513d..094e3ce91568623094d272c85a5c10366498be88 100644 (file)
--- a/src/test/pretty/closure-reform-pretty.rs
+++ b/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) { }
 

diff --git a/src/test/pretty/disamb-stmt-expr.rs b/src/test/pretty/disamb-stmt-expr.rs
index 78658a4c12169db5709fcdefc9dd14c3c5ed4f97..0c4cd103b82ef73547ebf7c1e32da23d101d18ef 100644 (file)
--- a/src/test/pretty/disamb-stmt-expr.rs
+++ b/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() { }

diff --git a/src/test/pretty/do1.rs b/src/test/pretty/do1.rs
index cd7a5b29a8af1eef189c8604220e33efad5a995e..e0066053f3c5baf5b9d2f0ad2c347055a7b5db10 100644 (file)
--- a/src/test/pretty/do1.rs
+++ b/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) }) }

diff --git a/src/test/pretty/fn-types.rs b/src/test/pretty/fn-types.rs
index 1313af2df3d88c742a5b11f7b9658ca6519157e4..31efb0c9ab1ebd84f9a87f6126194232faaf846f 100644 (file)
--- a/src/test/pretty/fn-types.rs
+++ b/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() { }