Skip to content

Commit 5dadee1

Browse files
committed
minor core/std cleanup
1 parent edd6d9e commit 5dadee1

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/libcore/task.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ fn each_ancestor(list: &mut AncestorList,
910910
}
911911

912912
// One of these per task.
913-
struct Tcb {
913+
struct TCB {
914914
let me: *rust_task;
915915
// List of tasks with whose fates this one's is intertwined.
916916
let tasks: TaskGroupArc; // 'none' means the group has failed.
@@ -1051,7 +1051,7 @@ fn gen_child_taskgroup(linked: bool, supervised: bool)
10511051
mut descendants: new_taskset() }));
10521052
// Main task/group has no ancestors, no notifier, etc.
10531053
let group =
1054-
@Tcb(spawner, tasks, AncestorList(None), true, None);
1054+
@TCB(spawner, tasks, AncestorList(None), true, None);
10551055
unsafe { local_set(spawner, taskgroup_key!(), group); }
10561056
group
10571057
}
@@ -1165,7 +1165,7 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) {
11651165
let notifier = notify_chan.map(|c| AutoNotify(c));
11661166

11671167
if enlist_many(child, &child_arc, &mut ancestors) {
1168-
let group = @Tcb(child, child_arc, ancestors,
1168+
let group = @TCB(child, child_arc, ancestors,
11691169
is_main, notifier);
11701170
unsafe { local_set(child, taskgroup_key!(), group); }
11711171
// Run the child's body.

src/libstd/getopts.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ mod tests {
877877
let opts = ~[optopt(~"e"), optopt(~"encrypt")];
878878
let matches = match getopts(args, opts) {
879879
result::ok(m) => m,
880-
result::err(f) => fail
880+
result::err(_) => fail
881881
};
882882
assert opts_present(matches, ~[~"e"]);
883883
assert opts_present(matches, ~[~"encrypt"]);
@@ -898,7 +898,7 @@ mod tests {
898898
let opts = ~[optmulti(~"L")];
899899
let matches = match getopts(args, opts) {
900900
result::ok(m) => m,
901-
result::err(f) => fail
901+
result::err(_) => fail
902902
};
903903
assert opts_present(matches, ~[~"L"]);
904904
assert opts_str(matches, ~[~"L"]) == ~"foo";

0 commit comments

Comments
 (0)