---

pcwalton · pcwalton · commit 192da97a88cb · 2012-03-13T11:34:48.000-07:00
yaml --- r: 11811 b: refs/heads/master c: 014dd54 h: refs/heads/master i: 11809: 20868be 11807: 26bd8e9 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ec340c8f40aef3d98e30d22211550b8efa5ed1e0
+refs/heads/master: 014dd547a03df624539c968ab99816d5e7c23363
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rustc/middle/typeck.rs b/trunk/src/rustc/middle/typeck.rs
@@ -321,10 +321,12 @@ fn ast_ty_to_ty(tcx: ty::ctxt, mode: mode, &&ast_ty: @ast::ty) -> ty::t {
       }
       ast::ty_rptr(region, mt) {
         let region = alt region.node {
-            ast::re_inferred {
+            ast::re_inferred | ast::re_self {
                 tcx.region_map.ast_type_to_inferred_region.get(ast_ty.id)
             }
-            _ { tcx.region_map.ast_type_to_region.get(region.id) }
+            ast::re_named(_) {
+                tcx.region_map.ast_type_to_region.get(region.id)
+            }
         };
         ty::mk_rptr(tcx, region, ast_mt_to_mt(tcx, mode, mt))
       }

Original file line number	Diff line number	Diff line change
`@@ -321,10 +321,12 @@ fn ast_ty_to_ty(tcx: ty::ctxt, mode: mode, &&ast_ty: @ast::ty) -> ty::t {`
`321`	`321`	`}`
`322`	`322`	`ast::ty_rptr(region, mt) {`
`323`	`323`	`let region = alt region.node {`
`324`		`- ast::re_inferred {`
	`324`	`+ ast::re_inferred \| ast::re_self {`
`325`	`325`	`tcx.region_map.ast_type_to_inferred_region.get(ast_ty.id)`
`326`	`326`	`}`
`327`		`- _ { tcx.region_map.ast_type_to_region.get(region.id) }`
	`327`	`+ ast::re_named(_) {`
	`328`	`+ tcx.region_map.ast_type_to_region.get(region.id)`
	`329`	`+ }`
`328`	`330`	`};`
`329`	`331`	`ty::mk_rptr(tcx, region, ast_mt_to_mt(tcx, mode, mt))`
`330`	`332`	`}`