diff options
| author | Ziad Hatahet <hatahet@gmail.com> | 2013-10-23 10:09:06 -0700 |
|---|---|---|
| committer | Ziad Hatahet <hatahet@gmail.com> | 2013-10-23 10:09:06 -0700 |
| commit | 7d69837bd263f334aa9dea4235698c006f7b1ce8 (patch) | |
| tree | b43315adfc734b0ab480b40674721c99902f3eb2 /src/libstd/task | |
| parent | 60245b9290388671edac86d6db1619f60a9ccb68 (diff) | |
| parent | a4ec8af4c549bd806522826b756e18fbf0b5c47b (diff) | |
| download | rust-7d69837bd263f334aa9dea4235698c006f7b1ce8.tar.gz rust-7d69837bd263f334aa9dea4235698c006f7b1ce8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/libstd/task')
| -rw-r--r-- | src/libstd/task/mod.rs | 18 | ||||
| -rw-r--r-- | src/libstd/task/spawn.rs | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs index 970a62b676f..30c99c62885 100644 --- a/src/libstd/task/mod.rs +++ b/src/libstd/task/mod.rs @@ -108,7 +108,7 @@ pub enum SchedMode { * */ pub struct SchedOpts { - mode: SchedMode, + priv mode: SchedMode, } /** @@ -144,11 +144,11 @@ pub struct SchedOpts { * scheduler other tasks will be impeded or even blocked indefinitely. */ pub struct TaskOpts { - linked: bool, - supervised: bool, - watched: bool, - indestructible: bool, - notify_chan: Option<Chan<TaskResult>>, + priv linked: bool, + priv supervised: bool, + priv watched: bool, + priv indestructible: bool, + priv notify_chan: Option<Chan<TaskResult>>, name: Option<SendStr>, sched: SchedOpts, stack_size: Option<uint> @@ -170,9 +170,9 @@ pub struct TaskOpts { // FIXME (#3724): Replace the 'consumed' bit with move mode on self pub struct TaskBuilder { opts: TaskOpts, - gen_body: Option<~fn(v: ~fn()) -> ~fn()>, - can_not_copy: Option<util::NonCopyable>, - consumed: bool, + priv gen_body: Option<~fn(v: ~fn()) -> ~fn()>, + priv can_not_copy: Option<util::NonCopyable>, + priv consumed: bool, } /** diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 7cf0f04c7e9..dec13eded39 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -308,10 +308,10 @@ fn each_ancestor(list: &mut AncestorList, // One of these per task. pub struct Taskgroup { // List of tasks with whose fates this one's is intertwined. - tasks: TaskGroupArc, // 'none' means the group has failed. + priv tasks: TaskGroupArc, // 'none' means the group has failed. // Lists of tasks who will kill us if they fail, but whom we won't kill. - ancestors: AncestorList, - notifier: Option<AutoNotify>, + priv ancestors: AncestorList, + priv notifier: Option<AutoNotify>, } impl Drop for Taskgroup { |