File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed
branches/try/src/rustc/middle/trans Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change 2
2
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5
- refs/heads/try: 6f0cbf4cd4364ee5d7b2c723089dfacf711df8f4
5
+ refs/heads/try: 26630187920a8b3f1b2f2d73f0172addd6c35ccd
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
Original file line number Diff line number Diff line change @@ -632,7 +632,7 @@ fn simplify_type(tcx: ty::ctxt, typ: ty::t) -> ty::t {
632
632
fn simplifier ( tcx : ty:: ctxt , typ : ty:: t ) -> ty:: t {
633
633
alt ty:: get ( typ) . struct {
634
634
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) }
636
636
ty:: ty_fn ( _) { ty:: mk_tup ( tcx, [ nilptr ( tcx) , nilptr ( tcx) ] ) }
637
637
ty:: ty_res ( _, sub, tps) {
638
638
let sub1 = ty:: substitute_type_params ( tcx, tps, sub) ;
You can’t perform that action at this time.
0 commit comments