---

yaml
---
r: 12549
b: refs/heads/master
c: 3d6c791
h: refs/heads/master
i:
  12547: 920bb89
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3c995fb8f3676a313f5ac883e175cc5fe354e640
+refs/heads/master: 3d6c79109e869de58d6545f683b3e796237039fb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/librustsyntax/parse/parser.rs

@@ -2249,7 +2249,12 @@ fn parse_item_type(p: parser, attrs: [ast::attribute]) -> @ast::item {
 }
 
 fn parse_region_param(p: parser) -> ast::region_param {
-    if eat(p, token::BINOP(token::AND)) {ast::rp_self} else {ast::rp_none}
+    if eat(p, token::BINOP(token::SLASH)) {
+        expect(p, token::BINOP(token::AND));
+        ast::rp_self
+    } else {
+        ast::rp_none
+    }
 }
 
 fn parse_item_enum(p: parser, attrs: [ast::attribute]) -> @ast::item {

trunk/src/librustsyntax/print/pprust.rs

@@ -1407,7 +1407,7 @@ fn print_bounds(s: ps, bounds: @[ast::ty_param_bound]) {
 
 fn print_region_param(s: ps, rp: ast::region_param) {
     alt rp {
-      ast::rp_self { word(s.s, "&") }
+      ast::rp_self { word(s.s, "/&") }
       ast::rp_none { }
     }
 }

trunk/src/test/bench/shootout-binarytrees.rs

@@ -2,7 +2,7 @@ use std;
 import std::arena;
 import std::arena::arena;
 
-enum tree& { nil, node(&tree, &tree, int), }
+enum tree/& { nil, node(&tree, &tree, int), }
 
 fn item_check(t: &tree) -> int {
     alt *t {

trunk/src/test/compile-fail/regions-creating-enums.rs

@@ -1,4 +1,4 @@
-enum ast& {
+enum ast/& {
     num(uint),
     add(&ast, &ast)
 }

trunk/src/test/compile-fail/regions-in-enums.rs

@@ -10,15 +10,15 @@ enum no2 {
     x2(&foo.uint) //! ERROR named regions other than `self` are not allowed as part of a type declaration
 }
 
-enum yes0& {
+enum yes0/& {
     x3(&uint)
 }
 
-enum yes1& {
+enum yes1/& {
     x4(&self.uint)
 }
 
-enum yes2& {
+enum yes2/& {
     x5(&foo.uint) //! ERROR named regions other than `self` are not allowed as part of a type declaration
 }
 

trunk/src/test/compile-fail/regions-in-rsrcs.rs

@@ -7,13 +7,13 @@ resource no1(x: &self.uint) { //! ERROR to use region types here, the containing
 resource no2(x: &foo.uint) { //! ERROR named regions other than `self` are not allowed as part of a type declaration
 }
 
-resource yes0&(x: &uint) {
+resource yes0/&(x: &uint) {
 }
 
-resource yes1&(x: &self.uint) {
+resource yes1/&(x: &self.uint) {
 }
 
-resource yes2&(x: &foo.uint) { //! ERROR named regions other than `self` are not allowed as part of a type declaration
+resource yes2/&(x: &foo.uint) { //! ERROR named regions other than `self` are not allowed as part of a type declaration
 }
 
 fn main() {}

trunk/src/test/compile-fail/regions-in-type-items.rs

@@ -10,15 +10,15 @@ type item_ty_no2 = {
     x: &foo.uint //! ERROR named regions other than `self` are not allowed as part of a type declaration
 };
 
-type item_ty_yes0& = {
+type item_ty_yes0/& = {
     x: &uint
 };
 
-type item_ty_yes1& = {
+type item_ty_yes1/& = {
     x: &self.uint
 };
 
-type item_ty_yes2& = {
+type item_ty_yes2/& = {
     x: &foo.uint //! ERROR named regions other than `self` are not allowed as part of a type declaration
 };
 

trunk/src/test/run-pass/regions-mock-trans-impls.rs

@@ -2,11 +2,11 @@ import libc, sys, unsafe;
 
 enum arena = ();
 
-type bcx& = {
+type bcx/& = {
     fcx: &fcx
 };
 
-type fcx& = {
+type fcx/& = {
     arena: &arena,
     ccx: &ccx
 };

trunk/src/test/run-pass/regions-mock-trans.rs

@@ -2,11 +2,11 @@ import libc, sys, unsafe;
 
 enum arena = ();
 
-type bcx& = {
+type bcx/& = {
     fcx: &fcx
 };
 
-type fcx& = {
+type fcx/& = {
     arena: &arena,
     ccx: &ccx
 };