From 5dadee1ee72ae2c12ba6ead0bdb274afe444ceda Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Sun, 26 Aug 2012 21:17:17 -0400
Subject: [PATCH] minor core/std cleanup

---
 src/libcore/task.rs   | 6 +++---
 src/libstd/getopts.rs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libcore/task.rs b/src/libcore/task.rs
index 7afd81c01297..2699c0d3b3de 100644
--- a/src/libcore/task.rs
+++ b/src/libcore/task.rs
@@ -910,7 +910,7 @@ fn each_ancestor(list:        &mut AncestorList,
 }
 
 // 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 spawn_raw(+opts: TaskOpts, +f: fn~()) {
             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.
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index cac17b319e13..ea62f3cc3c43 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -877,7 +877,7 @@ mod tests {
         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 @@ mod tests {
         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";