---

yaml
---
r: 30114
b: refs/heads/incoming
c: 5dadee1
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: edd6d9ea37f55cce3298deb6ef271cb7d03a824a
+refs/heads/incoming: 5dadee1ee72ae2c12ba6ead0bdb274afe444ceda
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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.

branches/incoming/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";