Skip to content

Commit c1112a9

Browse files
committed
---
yaml --- r: 6450 b: refs/heads/master c: 03f6060 h: refs/heads/master v: v3
1 parent 40d50bd commit c1112a9

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 9fb3719ded8d6938c21710d4b487ab1328c7dd5e
2+
refs/heads/master: 03f6060e802e1acd8efe85b07bc98a97bf5caa7d

trunk/src/comp/middle/ty.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ fn type_kind(cx: ctxt, ty: t) -> ast::kind {
986986
let result = alt struct(cx, ty) {
987987
// Scalar and unique types are sendable
988988
ty_nil. | ty_bot. | ty_bool. | ty_int. | ty_uint. | ty_float. |
989-
ty_machine(_) | ty_char. | ty_native(_) |
989+
ty_machine(_) | ty_char. | ty_native(_) | ty_ptr(_) |
990990
ty_type. | ty_str. | ty_native_fn(_, _) { ast::kind_sendable }
991991
// FIXME: obj is broken for now, since we aren't asserting
992992
// anything about its fields.
@@ -1003,8 +1003,8 @@ fn type_kind(cx: ctxt, ty: t) -> ast::kind {
10031003
// Those with refcounts-to-inner raise pinned to shared,
10041004
// lower unique to shared. Therefore just set result to shared.
10051005
ty_box(mt) { ast::kind_copyable }
1006-
// Pointers and unique containers raise pinned to shared.
1007-
ty_ptr(tm) | ty_vec(tm) | ty_uniq(tm) { type_kind(cx, tm.ty) }
1006+
// Boxes and unique pointers raise pinned to shared.
1007+
ty_vec(tm) | ty_uniq(tm) { type_kind(cx, tm.ty) }
10081008
// Records lower to the lowest of their members.
10091009
ty_rec(flds) {
10101010
let lowest = ast::kind_sendable;

0 commit comments

Comments
 (0)