File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5
5
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: 5bfb5cad3a8d5f9c1819472bcd166f8ed8972b6d
8
+ refs/heads/try2: d93f3c5d835f12614f07c2d840799dd02f4780bc
9
9
refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
10
10
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
11
11
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
Original file line number Diff line number Diff line change @@ -41,10 +41,10 @@ class arc_destruct<T> {
41
41
}
42
42
}
43
43
44
- type arc < T : const > = arc_destruct < T > ;
44
+ type arc < T : const send > = arc_destruct < T > ;
45
45
46
46
/// Create an atomically reference counted wrapper.
47
- fn arc < T : const > ( -data : T ) -> arc < T > {
47
+ fn arc < T : const send > ( -data : T ) -> arc < T > {
48
48
let data = ~{ mut count: 1 , data: data} ;
49
49
unsafe {
50
50
let ptr = unsafe :: transmute ( data) ;
@@ -56,7 +56,7 @@ fn arc<T: const>(-data: T) -> arc<T> {
56
56
* Access the underlying data in an atomically reference counted
57
57
* wrapper.
58
58
*/
59
- fn get < T : const > ( rc : & a. arc < T > ) -> & a . T {
59
+ fn get < T : const send > ( rc : & a. arc < T > ) -> & a . T {
60
60
unsafe {
61
61
let ptr: ~arc_data < T > = unsafe :: reinterpret_cast ( ( * rc) . data ) ;
62
62
// Cast us back into the correct region
@@ -73,7 +73,7 @@ fn get<T: const>(rc: &a.arc<T>) -> &a.T {
73
73
* object. However, one of the `arc` objects can be sent to another task,
74
74
* allowing them to share the underlying data.
75
75
*/
76
- fn clone < T : const > ( rc : & arc < T > ) -> arc < T > {
76
+ fn clone < T : const send > ( rc : & arc < T > ) -> arc < T > {
77
77
unsafe {
78
78
let ptr: ~arc_data < T > = unsafe :: reinterpret_cast ( ( * rc) . data ) ;
79
79
let new_count = rustrt:: rust_atomic_increment ( & mut ptr. count ) ;
Original file line number Diff line number Diff line change 1
1
// error-pattern:explicit failure
2
2
3
- enum e < T : const > { e( arc:: arc < T > ) }
3
+ enum e < T : const send > { e( arc:: arc < T > ) }
4
4
5
5
fn foo ( ) -> e < int > { fail; }
6
6
You can’t perform that action at this time.
0 commit comments