---

yaml
---
r: 23518
b: refs/heads/master
c: a831726
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 330311658ff0cb48c70e769911fe67d5cd90dd78
+refs/heads/master: a831726b94154e040479b86b33f891f1e2ecc1d4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/unsafe.rs

@@ -203,8 +203,8 @@ unsafe fn shared_mutable_state<T: send>(+data: T) -> SharedMutableState<T> {
 }
 
 #[inline(always)]
-unsafe fn get_shared_mutable_state<T: send>(rc: &SharedMutableState<T>)
-        -> &mut T {
+unsafe fn get_shared_mutable_state<T: send>(rc: &a/SharedMutableState<T>)
+        -> &a/mut T {
     unsafe {
         let ptr: ~ArcData<T> = unsafe::reinterpret_cast((*rc).data);
         assert ptr.count > 0;
@@ -215,8 +215,8 @@ unsafe fn get_shared_mutable_state<T: send>(rc: &SharedMutableState<T>)
     }
 }
 #[inline(always)]
-unsafe fn get_shared_immutable_state<T: send>(rc: &SharedMutableState<T>)
-        -> &T {
+unsafe fn get_shared_immutable_state<T: send>(rc: &a/SharedMutableState<T>)
+        -> &a/T {
     unsafe {
         let ptr: ~ArcData<T> = unsafe::reinterpret_cast((*rc).data);
         assert ptr.count > 0;

trunk/src/libstd/arc.rs

@@ -81,7 +81,7 @@ fn arc<T: const send>(+data: T) -> ARC<T> {
  * Access the underlying data in an atomically reference counted
  * wrapper.
  */
-fn get<T: const send>(rc: &ARC<T>) -> &T {
+fn get<T: const send>(rc: &a/ARC<T>) -> &a/T {
     unsafe { get_shared_immutable_state(&rc.x) }
 }