---

yaml
---
r: 189919
b: refs/heads/master
c: a07945d
h: refs/heads/master
i:
  189917: 05d1d77
  189915: 6543bae
  189911: b20eed8
  189903: ef66675
  189887: e146798
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4e877adddf7b2f7d9093bf26cd8649f30c04b834
+refs/heads/master: a07945d663f4d5767314454bb8265723178bf26c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 270a677d4d698916f5ad103f0afc3c070b8dbeb4
 refs/heads/try: 1c28ab65017d74fc13d003f7c7a73d1a48e5406f

trunk/src/libsyntax/parse/obsolete.rs

@@ -24,8 +24,6 @@ use ptr::P;
 pub enum ObsoleteSyntax {
     Sized,
     ForSized,
-    ProcType,
-    ProcExpr,
     ClosureType,
     ClosureKind,
     EmptyIndex,
@@ -57,16 +55,6 @@ impl<'a> ParserObsoleteMethods for parser::Parser<'a> {
                  by default",
                 true,
             ),
-            ObsoleteSyntax::ProcType => (
-                "the `proc` type",
-                "is not used for moment, use unboxed closures instead",
-                true,
-            ),
-            ObsoleteSyntax::ProcExpr => (
-                "`proc` expression",
-                "is not used for the moment, use a `move ||` expression instead",
-                true,
-            ),
             ObsoleteSyntax::ClosureType => (
                 "`|usize| -> bool` closure type",
                 "use unboxed closures instead, no type annotation needed",

trunk/src/libsyntax/parse/parser.rs

@@ -1119,35 +1119,6 @@ impl<'a> Parser<'a> {
         }))
     }
 
-    /// Parses a procedure type (`proc`). The initial `proc` keyword must
-    /// already have been parsed.
-    pub fn parse_proc_type(&mut self, lifetime_defs: Vec<ast::LifetimeDef>) -> Ty_ {
-        /*
-
-        proc <'lt> (S) [:Bounds] -> T
-        ^~~^ ^~~~^  ^  ^~~~~~~~^    ^
-         |     |    |      |        |
-         |     |    |      |      Return type
-         |     |    |    Bounds
-         |     |  Argument types
-         |   Legacy lifetimes
-        the `proc` keyword (already consumed)
-
-        */
-
-        let proc_span = self.last_span;
-
-        // To be helpful, parse the proc as ever
-        let _ = self.parse_legacy_lifetime_defs(lifetime_defs);
-        let _ = self.parse_fn_args(false, false);
-        let _ = self.parse_colon_then_ty_param_bounds(BoundParsingMode::Bare);
-        let _ = self.parse_ret_ty();
-
-        self.obsolete(proc_span, ObsoleteSyntax::ProcType);
-
-        TyInfer
-    }
-
     /// Parses an obsolete closure kind (`&:`, `&mut:`, or `:`).
     pub fn parse_obsolete_closure_kind(&mut self) {
          let lo = self.span.lo;