Skip to content

Commit 9ee9e36

Browse files
committed
---
yaml --- r: 24570 b: refs/heads/try2 c: d93f3c5 h: refs/heads/master v: v3
1 parent 1b60b08 commit 9ee9e36

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 5bfb5cad3a8d5f9c1819472bcd166f8ed8972b6d
8+
refs/heads/try2: d93f3c5d835f12614f07c2d840799dd02f4780bc
99
refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/arc.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ class arc_destruct<T> {
4141
}
4242
}
4343

44-
type arc<T: const> = arc_destruct<T>;
44+
type arc<T: const send> = arc_destruct<T>;
4545

4646
/// 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> {
4848
let data = ~{mut count: 1, data: data};
4949
unsafe {
5050
let ptr = unsafe::transmute(data);
@@ -56,7 +56,7 @@ fn arc<T: const>(-data: T) -> arc<T> {
5656
* Access the underlying data in an atomically reference counted
5757
* wrapper.
5858
*/
59-
fn get<T: const>(rc: &a.arc<T>) -> &a.T {
59+
fn get<T: const send>(rc: &a.arc<T>) -> &a.T {
6060
unsafe {
6161
let ptr: ~arc_data<T> = unsafe::reinterpret_cast((*rc).data);
6262
// Cast us back into the correct region
@@ -73,7 +73,7 @@ fn get<T: const>(rc: &a.arc<T>) -> &a.T {
7373
* object. However, one of the `arc` objects can be sent to another task,
7474
* allowing them to share the underlying data.
7575
*/
76-
fn clone<T: const>(rc: &arc<T>) -> arc<T> {
76+
fn clone<T: const send>(rc: &arc<T>) -> arc<T> {
7777
unsafe {
7878
let ptr: ~arc_data<T> = unsafe::reinterpret_cast((*rc).data);
7979
let new_count = rustrt::rust_atomic_increment(&mut ptr.count);

branches/try2/src/test/run-fail/issue-2444.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// error-pattern:explicit failure
22

3-
enum e<T: const> { e(arc::arc<T>) }
3+
enum e<T: const send> { e(arc::arc<T>) }
44

55
fn foo() -> e<int> {fail;}
66

0 commit comments

Comments
 (0)