Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/libcore/cleanup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ pub unsafe fn annihilate() {
extern mod rustrt {
#[legacy_exports];
#[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;
}

2 changes: 1 addition & 1 deletion src/libstd/future.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/libstd/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 }
Expand Down