---

yaml
---
r: 39793
b: refs/heads/incoming
c: 6df6439
h: refs/heads/master
i:
  39791: 52ef08f
v: v3

Author: auroranockert

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 9fd970ad13bca7f6155ed15901492cd190c81616
+refs/heads/incoming: 6df643981b5367e3a72d7e0dddd7bc26785a857f
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/cleanup.rs

@@ -160,7 +160,6 @@ pub unsafe fn annihilate() {
 extern mod rustrt {
     #[legacy_exports];
     #[rust_stack]
-    // FIXME (#4386): Unable to make following method private.
-    /* priv */ unsafe fn rust_get_task() -> *c_void;
+    /*priv*/ unsafe fn rust_get_task() -> *c_void;
 }
 

branches/incoming/src/libstd/future.rs

@@ -31,7 +31,7 @@ use core::task;
 
 #[doc = "The future type"]
 pub struct Future<A> {
-    priv mut state: FutureState<A>,
+    /*priv*/ mut state: FutureState<A>,
 }
 
 // FIXME(#2829) -- futures should not be copyable, because they close

branches/incoming/src/libstd/sync.rs

@@ -360,7 +360,7 @@ impl &Sem<~[mut Waitqueue]> {
 struct Semaphore { priv sem: Sem<()> }
 
 /// Create a new semaphore with the specified count.
-fn semaphore(count: int) -> Semaphore {
+pub fn semaphore(count: int) -> Semaphore {
     Semaphore { sem: new_sem(count, ()) }
 }
 
@@ -449,9 +449,9 @@ struct RWlockInner {
  * unwinds.
  */
 struct RWlock {
-    priv order_lock:  Semaphore,
-    priv access_lock: Sem<~[mut Waitqueue]>,
-    priv state:       Exclusive<RWlockInner>
+    /* priv */ order_lock:  Semaphore,
+    /* priv */ access_lock: Sem<~[mut Waitqueue]>,
+    /* priv */ state:       Exclusive<RWlockInner>
 }
 
 /// Create a new rwlock, with one associated condvar.
@@ -683,7 +683,7 @@ fn RWlockReleaseDowngrade(lock: &r/RWlock) -> RWlockReleaseDowngrade/&r {
 }
 
 /// The "write permission" token used for rwlock.write_downgrade().
-pub struct RWlockWriteMode { priv lock: &RWlock }
+pub struct RWlockWriteMode { /* priv */ lock: &RWlock }
 impl RWlockWriteMode : Drop { fn finalize(&self) {} }
 /// The "read permission" token used for rwlock.write_downgrade().
 pub struct RWlockReadMode  { priv lock: &RWlock }