Skip to content

Commit 2351862

Browse files
committed
---
yaml --- r: 28096 b: refs/heads/try c: a831726 h: refs/heads/master v: v3
1 parent 18fc6ff commit 2351862

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
@@ -2,7 +2,7 @@
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5-
refs/heads/try: 330311658ff0cb48c70e769911fe67d5cd90dd78
5+
refs/heads/try: a831726b94154e040479b86b33f891f1e2ecc1d4
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/libcore/unsafe.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ unsafe fn shared_mutable_state<T: send>(+data: T) -> SharedMutableState<T> {
203203
}
204204
205205
#[inline(always)]
206-
unsafe fn get_shared_mutable_state<T: send>(rc: &SharedMutableState<T>)
207-
-> &mut T {
206+
unsafe fn get_shared_mutable_state<T: send>(rc: &a/SharedMutableState<T>)
207+
-> &a/mut T {
208208
unsafe {
209209
let ptr: ~ArcData<T> = unsafe::reinterpret_cast((*rc).data);
210210
assert ptr.count > 0;
@@ -215,8 +215,8 @@ unsafe fn get_shared_mutable_state<T: send>(rc: &SharedMutableState<T>)
215215
}
216216
}
217217
#[inline(always)]
218-
unsafe fn get_shared_immutable_state<T: send>(rc: &SharedMutableState<T>)
219-
-> &T {
218+
unsafe fn get_shared_immutable_state<T: send>(rc: &a/SharedMutableState<T>)
219+
-> &a/T {
220220
unsafe {
221221
let ptr: ~ArcData<T> = unsafe::reinterpret_cast((*rc).data);
222222
assert ptr.count > 0;

branches/try/src/libstd/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fn arc<T: const send>(+data: T) -> ARC<T> {
8181
* Access the underlying data in an atomically reference counted
8282
* wrapper.
8383
*/
84-
fn get<T: const send>(rc: &ARC<T>) -> &T {
84+
fn get<T: const send>(rc: &a/ARC<T>) -> &a/T {
8585
unsafe { get_shared_immutable_state(&rc.x) }
8686
}
8787

0 commit comments

Comments
 (0)