Skip to content

Commit 7e9efed

Browse files
committed
---
yaml --- r: 15745 b: refs/heads/try c: a7e0eb3 h: refs/heads/master i: 15743: b40eacf v: v3
1 parent 21e3684 commit 7e9efed

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-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: c6d33c3d37c0e9f8db88b7402da45506d7f44d33
5+
refs/heads/try: a7e0eb35819bb9171b60f2854753f7784da6a087
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,11 +1475,14 @@ fn is_instantiable(cx: ctxt, r_ty: t) -> bool {
14751475

14761476
ty_box(mt) |
14771477
ty_uniq(mt) |
1478-
ty_ptr(mt) |
14791478
ty_rptr(_, mt) {
14801479
be type_requires(cx, seen, r_ty, mt.ty);
14811480
}
14821481

1482+
ty_ptr(mt) {
1483+
false // unsafe ptrs can always be NULL
1484+
}
1485+
14831486
ty_rec(fields) {
14841487
vec::any(fields) {|field|
14851488
type_requires(cx, seen, r_ty, field.mt.ty)

0 commit comments

Comments
 (0)