---

yaml
---
r: 14735
b: refs/heads/try
c: e2f6052
h: refs/heads/master
i:
  14733: 6d03c6d
  14731: a2789f0
  14727: 22768bf
  14719: 6a5b057
v: v3

Author: pcwalton

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 0d4cb759494f9589ba57c4f2c41f5a5737ab74e0
+refs/heads/try: e2f6052c6d34229e41530d2260cd1915d11659bc
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/metadata/astencode.rs

@@ -434,7 +434,6 @@ impl of tr for ast::def {
           ast::def_class_method(did0, did1) {
             ast::def_class_method(did0.tr(xcx), did1.tr(xcx))
           }
-          ast::def_region_param(did) { ast::def_region_param(did.tr(xcx)) }
         }
     }
 }
@@ -1005,4 +1004,4 @@ fn test_simplification() {
       }
       _ { fail; }
     }
-}
+}

branches/try/src/rustc/metadata/astencode_gen.rs

@@ -1711,8 +1711,7 @@ fn ns_for_def(d: def) -> namespace {
           { ns_val(value_or_enum) }
       ast::def_mod(_) | ast::def_native_mod(_) { ns_module }
       ast::def_ty(_) | ast::def_binding(_) | ast::def_use(_) |
-      ast::def_ty_param(_, _) | ast::def_prim_ty(_) | ast::def_class(_) |
-      ast::def_region_param(_)
+      ast::def_ty_param(_, _) | ast::def_prim_ty(_) | ast::def_class(_)
       { ns_type }
     }
 }

branches/try/src/rustc/middle/resolve.rs

@@ -28,8 +28,6 @@ enum ty_param_bound {
 
 type ty_param = {ident: ident, id: node_id, bounds: @[ty_param_bound]};
 
-type region_param = {ident: ident, id: node_id};
-
 enum def {
     def_fn(def_id, purity),
     def_self(node_id),
@@ -52,8 +50,7 @@ enum def {
     def_class_field(def_id, def_id),
     // No purity allowed for now, I guess
     // (simpler this way, b/c presumably methods read mutable state)
-    def_class_method(def_id, def_id),
-    def_region_param(def_id),
+    def_class_method(def_id, def_id)
 }
 
 // The set of meta_items that define the compilation environment of the crate,
@@ -345,7 +342,7 @@ enum prim_ty {
 
 enum region {
     re_inferred,
-    re_named(region_param),
+    re_named(ident),
     re_self
 }
 

branches/try/src/rustc/syntax/ast.rs

@@ -39,8 +39,7 @@ fn def_id_of_def(d: def) -> def_id {
       def_native_mod(id) | def_const(id) |
       def_variant(_, id) | def_ty(id) | def_ty_param(id, _) |
       def_use(id) |
-      def_class(id) | def_class_field(_, id) | def_class_method(_, id) |
-      def_region_param(id) { id }
+      def_class(id) | def_class_field(_, id) | def_class_method(_, id) { id }
 
       def_arg(id, _) | def_local(id, _) | def_self(id) |
       def_upvar(id, _, _) | def_binding(id) {

branches/try/src/rustc/syntax/ast_util.rs

@@ -424,7 +424,7 @@ fn parse_region(p: parser) -> ast::region {
             if string == "self" {
                 ast::re_self
             } else {
-                ast::re_named({ ident: string, id: p.get_id()})
+                ast::re_named(string)
             }
         }
         _ { ast::re_inferred }

branches/try/src/rustc/syntax/parse/parser.rs

@@ -316,7 +316,7 @@ fn print_native_mod(s: ps, nmod: ast::native_mod, attrs: [ast::attribute]) {
 fn print_region(s: ps, region: ast::region) {
     alt region {
       ast::re_inferred { /* no-op */ }
-      ast::re_named(name) { word(s.s, name.ident); word(s.s, "."); }
+      ast::re_named(name) { word(s.s, name); word(s.s, "."); }
       ast::re_self { word(s.s, "self"); word(s.s, "."); }
     }
 }