---

yaml
---
r: 47037
b: refs/heads/try
c: 6c728e3
h: refs/heads/master
i:
  47035: 2086dfe
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
-refs/heads/try: ad8b437adabbc11e79c3672bd5c74294f38d3bc4
+refs/heads/try: 6c728e32c0bad69318c1c4d4413ea55ce7c5813f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libsyntax/parse/parser.rs

@@ -307,12 +307,12 @@ pub impl Parser {
     {
         /*
 
-        extern "ABI" [pure|unsafe] fn (S) -> T
-               ^~~~^ ^~~~~~~~~~~~^    ^~^    ^
-                 |     |               |     |
-                 |     |               |   Return type
-                 |     |             Argument types
-                 |     |
+        extern "ABI" [pure|unsafe] fn <'lt> (S) -> T
+               ^~~~^ ^~~~~~~~~~~~^    ^~~~^ ^~^    ^
+                 |     |                |    |     |
+                 |     |                |    |   Return type
+                 |     |                |  Argument types
+                 |     |            Lifetimes
                  |     |
                  |   Purity
                 ABI
@@ -333,12 +333,12 @@ pub impl Parser {
     {
         /*
 
-        (&|~|@) [r/] [pure|unsafe] [once] fn (S) -> T
-        ^~~~~~^ ^~~^ ^~~~~~~~~~~~^ ^~~~~^    ^~^    ^
-           |     |     |             |        |     |
-           |     |     |             |        |   Return type
-           |     |     |             |      Argument types
-           |     |     |             |
+        (&|~|@) [r/] [pure|unsafe] [once] fn <'lt> (S) -> T
+        ^~~~~~^ ^~~^ ^~~~~~~~~~~~^ ^~~~~^    ^~~~^ ^~^    ^
+           |     |     |             |         |    |     |
+           |     |     |             |         |    |   Return type
+           |     |     |             |         |  Argument types
+           |     |     |             |     Lifetimes
            |     |     |          Once-ness (a.k.a., affine)
            |     |   Purity
            | Lifetime bound
@@ -394,12 +394,24 @@ pub impl Parser {
     }
 
     fn parse_ty_fn_decl() -> fn_decl {
-        let inputs = do self.parse_unspanned_seq(
-            token::LPAREN, token::RPAREN,
-            seq_sep_trailing_disallowed(token::COMMA)) |p| {
+        /*
 
-            p.parse_arg_general(false)
-        };
+        (fn) <'lt> (S) -> T
+             ^~~~^ ^~^    ^
+               |    |     |
+               |    |   Return type
+               |  Argument types
+           Lifetimes
+
+        */
+        if self.eat(token::LT) {
+            let _lifetimes = self.parse_lifetimes();
+            self.expect(token::GT);
+        }
+        let inputs = self.parse_unspanned_seq(
+            token::LPAREN, token::RPAREN,
+            seq_sep_trailing_disallowed(token::COMMA),
+            |p| p.parse_arg_general(false));
         let (ret_style, ret_ty) = self.parse_ret_ty();
         ast::fn_decl { inputs: inputs, output: ret_ty, cf: ret_style }
     }

branches/try/src/test/compile-fail/regions-in-enums.rs

@@ -10,15 +10,15 @@
 
 enum yes0<'lt> {
     // This will eventually be legal (and in fact the only way):
-    x3(&'lt uint) //~ ERROR named regions other than `self` are not allowed as part of a type declaration
+    X3(&'lt uint) //~ ERROR named regions other than `self` are not allowed as part of a type declaration
 }
 
 enum yes1 {
-    x4(&'self uint)
+    X4(&'self uint)
 }
 
 enum yes2 {
-    x5(&'foo uint) //~ ERROR named regions other than `self` are not allowed as part of a type declaration
+    X5(&'foo uint) //~ ERROR named regions other than `self` are not allowed as part of a type declaration
 }
 
 fn main() {}

branches/try/src/test/compile-fail/regions-scoping.rs

@@ -10,13 +10,13 @@
 
 fn with<T>(t: T, f: fn(T)) { f(t) }
 
-fn nested(x: &x/int) {  // (1)
+fn nested<'x>(x: &'x int) {  // (1)
     do with(
-        fn&(x: &x/int, // Refers to the region `x` at (1)
-            y: &y/int, // A fresh region `y` (2)
-            z: fn(x: &x/int, // Refers to `x` at (1)
-                  y: &y/int, // Refers to `y` at (2)
-                  z: &z/int) -> &z/int) // A fresh region `z` (3)
+        fn&(x: &'x int, // Refers to the region `x` at (1)
+            y: &'y int, // A fresh region `y` (2)
+            z: fn<'z>(x: &'x int, // Refers to `x` at (1)
+                      y: &'y int, // Refers to `y` at (2)
+                      z: &'z int) -> &'z int) // A fresh region `z` (3)
             -> &x/int {
 
             if false { return z(x, y, x); }
@@ -29,13 +29,13 @@ fn nested(x: &x/int) {  // (1)
         }
     ) |foo| {
 
-        let a: &x/int = foo(x, x, |_x, _y, z| z );
-        let b: &x/int = foo(x, a, |_x, _y, z| z );
-        let c: &x/int = foo(a, a, |_x, _y, z| z );
+        let a: &'x int = foo(x, x, |_x, _y, z| z );
+        let b: &'x int = foo(x, a, |_x, _y, z| z );
+        let c: &'x int = foo(a, a, |_x, _y, z| z );
 
         let z = 3i;
-        let d: &x/int = foo(x, x, |_x, _y, z| z );
-        let e: &x/int = foo(x, &z, |_x, _y, z| z );
+        let d: &'x int = foo(x, x, |_x, _y, z| z );
+        let e: &'x int = foo(x, &z, |_x, _y, z| z );
 
         // This would result in an error, but it is not reported by typeck
         // anymore but rather borrowck. Therefore, it doesn't end up