Merge pull request #1008 from rust-lang-nursery/hrtb

Don't ignore universal quantification in function types

Author: nrc

Cargo.lock

@@ -28,7 +28,6 @@ impl Rewrite for Pat {
                 };
                 let mut_infix = format_mutability(mutability);
                 let id_str = ident.node.to_string();
-
                 let sub_pat = match *sub_pat {
                     Some(ref p) => {
                         // 3 - ` @ `.

src/patterns.rs

@@ -600,6 +600,19 @@ fn rewrite_bare_fn(bare_fn: &ast::BareFnTy,
                    -> Option<String> {
     let mut result = String::with_capacity(128);
 
+    if !bare_fn.lifetimes.is_empty() {
+        result.push_str("for<");
+        // 6 = "for<> ".len(), 4 = "for<".
+        // This doesn't work out so nicely for mutliline situation with lots of
+        // rightward drift. If that is a problem, we could use the list stuff.
+        result.push_str(&try_opt!(bare_fn.lifetimes
+                .iter()
+                .map(|l| l.rewrite(context, try_opt!(width.checked_sub(6)), offset + 4))
+                .collect::<Option<Vec<_>>>())
+            .join(", "));
+        result.push_str("> ");
+    }
+
     result.push_str(&::utils::format_unsafety(bare_fn.unsafety));
 
     if bare_fn.abi != abi::Abi::Rust {

src/types.rs

@@ -12,3 +12,5 @@ struct F {
     i: extern "C" fn(x: u8, /* comment 4*/ y: String, // comment 3
                      z: Foo, /* comment */ .../* comment 2*/ ),
 }
+
+fn issue_1006(def_id_to_string: for<'a, 'b> unsafe fn(TyCtxt<'b, 'tcx, 'tcx>, DefId) -> String) {}

tests/source/type.rs

@@ -21,3 +21,5 @@ struct F {
                      // comment
                      ... /* comment 2 */),
 }
+
+fn issue_1006(def_id_to_string: for<'a, 'b> unsafe fn(TyCtxt<'b, 'tcx, 'tcx>, DefId) -> String) {}