Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-16 04:55:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

minor core/std cleanup

Browse Source
This commit is contained in:
Ben Blum
2012-08-26 21:17:17 -04:00
parent edd6d9ea37
commit 5dadee1ee7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcore/task.rs
+3 -3
View File
@@ -910,7 +910,7 @@ fn with_parent_tg<U>(parent_group: &mut Option<TaskGroupArc>,
}
// One of these per task.
struct Tcb {
struct TCB {
let me: *rust_task;
// List of tasks with whose fates this one's is intertwined.
let tasks: TaskGroupArc; // 'none' means the group has failed.
@@ -1051,7 +1051,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
mut descendants: new_taskset() }));
// Main task/group has no ancestors, no notifier, etc.
let group =
@Tcb(spawner, tasks, AncestorList(None), true, None);
@TCB(spawner, tasks, AncestorList(None), true, None);
unsafe { local_set(spawner, taskgroup_key!(), group); }
group
}
@@ -1165,7 +1165,7 @@ fn make_child_wrapper(child: *rust_task, +child_arc: TaskGroupArc,
let notifier = notify_chan.map(|c| AutoNotify(c));
if enlist_many(child, &child_arc, &mut ancestors) {
let group = @Tcb(child, child_arc, ancestors,
let group = @TCB(child, child_arc, ancestors,
is_main, notifier);
unsafe { local_set(child, taskgroup_key!(), group); }
// Run the child's body.
src/libstd/getopts.rs
+2 -2
View File
@@ -877,7 +877,7 @@ fn test_multi() {
let opts = ~[optopt(~"e"), optopt(~"encrypt")];
let matches = match getopts(args, opts) {
result::ok(m) => m,
result::err(f) => fail
result::err(_) => fail
};
assert opts_present(matches, ~[~"e"]);
assert opts_present(matches, ~[~"encrypt"]);
@@ -898,7 +898,7 @@ fn test_nospace() {
let opts = ~[optmulti(~"L")];
let matches = match getopts(args, opts) {
result::ok(m) => m,
result::err(f) => fail
result::err(_) => fail
};
assert opts_present(matches, ~[~"L"]);
assert opts_str(matches, ~[~"L"]) == ~"foo";