Skip to content

Commit bae1262

Browse files
committed
---
yaml --- r: 14817 b: refs/heads/try c: 014dd54 h: refs/heads/master i: 14815: adb5c0a v: v3
1 parent 5a0db10 commit bae1262

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: ec340c8f40aef3d98e30d22211550b8efa5ed1e0
5+
refs/heads/try: 014dd547a03df624539c968ab99816d5e7c23363
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,10 +321,12 @@ fn ast_ty_to_ty(tcx: ty::ctxt, mode: mode, &&ast_ty: @ast::ty) -> ty::t {
321321
}
322322
ast::ty_rptr(region, mt) {
323323
let region = alt region.node {
324-
ast::re_inferred {
324+
ast::re_inferred | ast::re_self {
325325
tcx.region_map.ast_type_to_inferred_region.get(ast_ty.id)
326326
}
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+
}
328330
};
329331
ty::mk_rptr(tcx, region, ast_mt_to_mt(tcx, mode, mt))
330332
}

0 commit comments

Comments
 (0)