diff options
| author | bors <bors@rust-lang.org> | 2013-07-27 22:31:22 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-07-27 22:31:22 -0700 |
| commit | 9325535b41fa5a7cfac697e86ae86bd1384542e6 (patch) | |
| tree | f28193aa80d78d16efd25cf319fbd8b604125173 /src/libstd/task/spawn.rs | |
| parent | 3078e83c3f1a643ddbdefa78095e4fbda3cecc02 (diff) | |
| parent | 39b3a0561f06b1ea01a12d8fc3372334116a7833 (diff) | |
| download | rust-9325535b41fa5a7cfac697e86ae86bd1384542e6.tar.gz rust-9325535b41fa5a7cfac697e86ae86bd1384542e6.zip | |
auto merge of #7978 : sstewartgallus/rust/rename_arc, r=bblum
To be more specific: `UPPERCASETYPE` was changed to `UppercaseType` `type_new` was changed to `Type::new` `type_function(value)` was changed to `value.method()`
Diffstat (limited to 'src/libstd/task/spawn.rs')
| -rw-r--r-- | src/libstd/task/spawn.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index a17bb2b1632..61dcc33c629 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -91,7 +91,7 @@ use task::unkillable; use to_bytes::IterBytes; use uint; use util; -use unstable::sync::{Exclusive, exclusive}; +use unstable::sync::Exclusive; use rt::{OldTaskContext, TaskContext, SchedulerContext, GlobalContext, context}; use rt::local::Local; use rt::task::Task; @@ -545,7 +545,7 @@ impl RuntimeGlue { // Main task, doing first spawn ever. Lazily initialise here. let mut members = TaskSet::new(); members.insert(OldTask(me)); - let tasks = exclusive(Some(TaskGroupData { + let tasks = Exclusive::new(Some(TaskGroupData { members: members, descendants: TaskSet::new(), })); @@ -569,7 +569,7 @@ impl RuntimeGlue { let mut members = TaskSet::new(); let my_handle = (*me).death.kill_handle.get_ref().clone(); members.insert(NewTask(my_handle)); - let tasks = exclusive(Some(TaskGroupData { + let tasks = Exclusive::new(Some(TaskGroupData { members: members, descendants: TaskSet::new(), })); @@ -596,7 +596,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool) (spawner_group.tasks.clone(), ancestors, spawner_group.is_main) } else { // Child is in a separate group from spawner. - let g = exclusive(Some(TaskGroupData { + let g = Exclusive::new(Some(TaskGroupData { members: TaskSet::new(), descendants: TaskSet::new(), })); @@ -605,7 +605,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool) assert!(new_generation < uint::max_value); // Child's ancestors start with the spawner. // Build a new node in the ancestor list. - AncestorList(Some(exclusive(AncestorNode { + AncestorList(Some(Exclusive::new(AncestorNode { generation: new_generation, parent_group: spawner_group.tasks.clone(), ancestors: ancestors, |