Merge pull request #4443 from wting/4386_add_privs
Adds priv qualifiers where they have been commented out before implementation.
This commit is contained in:
commit
0bc730f9b0
|
@ -160,6 +160,7 @@ pub unsafe fn annihilate() {
|
||||||
extern mod rustrt {
|
extern mod rustrt {
|
||||||
#[legacy_exports];
|
#[legacy_exports];
|
||||||
#[rust_stack]
|
#[rust_stack]
|
||||||
/*priv*/ unsafe fn rust_get_task() -> *c_void;
|
// FIXME (#4386): Unable to make following method private.
|
||||||
|
/* priv */ unsafe fn rust_get_task() -> *c_void;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ use core::task;
|
||||||
|
|
||||||
#[doc = "The future type"]
|
#[doc = "The future type"]
|
||||||
pub struct Future<A> {
|
pub struct Future<A> {
|
||||||
/*priv*/ mut state: FutureState<A>,
|
priv mut state: FutureState<A>,
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME(#2829) -- futures should not be copyable, because they close
|
// FIXME(#2829) -- futures should not be copyable, because they close
|
||||||
|
|
|
@ -449,9 +449,9 @@ struct RWlockInner {
|
||||||
* unwinds.
|
* unwinds.
|
||||||
*/
|
*/
|
||||||
struct RWlock {
|
struct RWlock {
|
||||||
/* priv */ order_lock: Semaphore,
|
priv order_lock: Semaphore,
|
||||||
/* priv */ access_lock: Sem<~[mut Waitqueue]>,
|
priv access_lock: Sem<~[mut Waitqueue]>,
|
||||||
/* priv */ state: Exclusive<RWlockInner>
|
priv state: Exclusive<RWlockInner>
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create a new rwlock, with one associated condvar.
|
/// 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().
|
/// 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) {} }
|
impl RWlockWriteMode : Drop { fn finalize(&self) {} }
|
||||||
/// The "read permission" token used for rwlock.write_downgrade().
|
/// The "read permission" token used for rwlock.write_downgrade().
|
||||||
pub struct RWlockReadMode { priv lock: &RWlock }
|
pub struct RWlockReadMode { priv lock: &RWlock }
|
||||||
|
|
Loading…
Reference in New Issue