Skip to content

Commit 65c7ec1

Browse files
committed
---
yaml --- r: 15199 b: refs/heads/try c: 2663018 h: refs/heads/master i: 15197: f17a20b 15195: 009dfdd 15191: 4d736f1 15183: 1312154 15167: d234810 v: v3
1 parent 977a735 commit 65c7ec1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
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: 6f0cbf4cd4364ee5d7b2c723089dfacf711df8f4
5+
refs/heads/try: 26630187920a8b3f1b2f2d73f0172addd6c35ccd
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/trans/shape.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ fn simplify_type(tcx: ty::ctxt, typ: ty::t) -> ty::t {
632632
fn simplifier(tcx: ty::ctxt, typ: ty::t) -> ty::t {
633633
alt ty::get(typ).struct {
634634
ty::ty_box(_) | ty::ty_opaque_box | ty::ty_uniq(_) | ty::ty_vec(_) |
635-
ty::ty_ptr(_) { nilptr(tcx) }
635+
ty::ty_ptr(_) | ty::ty_rptr(_,_) { nilptr(tcx) }
636636
ty::ty_fn(_) { ty::mk_tup(tcx, [nilptr(tcx), nilptr(tcx)]) }
637637
ty::ty_res(_, sub, tps) {
638638
let sub1 = ty::substitute_type_params(tcx, tps, sub);

0 commit comments

Comments
 (0)