rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Treat static slices and rptrs as sendable.

Browse Source
This commit is contained in:
Graydon Hoare
2012-09-18 16:28:16 -07:00
parent e653d493fb
commit 9b58369f6b
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rustc/middle/ty.rs
View File

@@ -1950,7 +1950,11 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
// Trait instances are (for now) like shared boxes, basically // Trait instances are (for now) like shared boxes, basically
ty_trait(_, _, _) => kind_safe_for_default_mode() | kind_owned(), ty_trait(_, _, _) => kind_safe_for_default_mode() | kind_owned(),
// Region pointers are copyable but NOT owned nor sendable // Static region pointers are copyable and sendable, but not owned
ty_rptr(re_static, mt) =>
kind_safe_for_default_mode() | mutable_type_kind(cx, mt),
// General region pointers are copyable but NOT owned nor sendable
ty_rptr(_, _) => kind_safe_for_default_mode(), ty_rptr(_, _) => kind_safe_for_default_mode(),
// Unique boxes and vecs have the kind of their contained type, // Unique boxes and vecs have the kind of their contained type,
@@ -1972,6 +1976,9 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
ty_evec(tm, vstore_box) => { ty_evec(tm, vstore_box) => {
remove_send(kind_safe_for_default_mode() | mutable_type_kind(cx, tm)) remove_send(kind_safe_for_default_mode() | mutable_type_kind(cx, tm))
} }
ty_evec(tm, vstore_slice(re_static)) => {
kind_safe_for_default_mode() | mutable_type_kind(cx, tm)
}
ty_evec(tm, vstore_slice(_)) => { ty_evec(tm, vstore_slice(_)) => {
remove_owned_send(kind_safe_for_default_mode() | remove_owned_send(kind_safe_for_default_mode() |
mutable_type_kind(cx, tm)) mutable_type_kind(cx, tm))
@@ -1984,6 +1991,9 @@ fn type_kind(cx: ctxt, ty: t) -> kind {
ty_estr(vstore_box) => { ty_estr(vstore_box) => {
kind_safe_for_default_mode() | kind_const() | kind_owned() kind_safe_for_default_mode() | kind_const() | kind_owned()
} }
ty_estr(vstore_slice(re_static)) => {
kind_safe_for_default_mode() | kind_send_copy() | kind_const()
}
ty_estr(vstore_slice(_)) => { ty_estr(vstore_slice(_)) => {
kind_safe_for_default_mode() | kind_const() kind_safe_for_default_mode() | kind_const()
} }