diff options
| author | Tim Chevalier <chevalier@alum.wellesley.edu> | 2013-01-11 20:11:57 -0800 |
|---|---|---|
| committer | Tim Chevalier <chevalier@alum.wellesley.edu> | 2013-01-11 20:11:57 -0800 |
| commit | 0bc730f9b0ede1b8b90394f289ddf8cbd51e00e6 (patch) | |
| tree | 3b84ec35879c727e4b2948554b7779bc5432d28e /src/libstd | |
| parent | 847d30db661eb7e3e476b135fce86c92b862f035 (diff) | |
| parent | 9fd970ad13bca7f6155ed15901492cd190c81616 (diff) | |
Merge pull request #4443 from wting/4386_add_privs
Adds priv qualifiers where they have been commented out before implementation.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/future.rs | 2 | ||||
| -rw-r--r-- | src/libstd/sync.rs | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/future.rs b/src/libstd/future.rs index 6a34c29b516..7d61326c02f 100644 --- a/src/libstd/future.rs +++ b/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 diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index a883062c4b9..ce7a8481ffd 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -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 } |
