---

yaml
---
r: 30101
b: refs/heads/incoming
c: 09df8f1
h: refs/heads/master
i:
  30099: 46623f8
v: v3

Author: brson

[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: 0cece20ea5beb97ce31408a363c01cc34e62424b
+refs/heads/incoming: 09df8f1abfdca35f39a2e013290372552a8f9cc2
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/driver/driver.rs

@@ -272,7 +272,7 @@ fn pretty_print_input(sess: session, cfg: ast::crate_cfg, input: input,
                       ppm: pp_mode) {
     fn ann_paren_for_expr(node: pprust::ann_node) {
         match node {
-          pprust::node_expr(s, expr) => pprust::popen(s),
+          pprust::node_expr(s, _) => pprust::popen(s),
           _ => ()
         }
     }

branches/incoming/src/rustc/front/test.rs

@@ -105,7 +105,7 @@ fn fold_item(cx: test_ctxt, &&i: @ast::item, fld: fold::ast_fold) ->
 
     if is_test_fn(i) {
         match i.node {
-          ast::item_fn(decl, purity, _, _) if purity == ast::unsafe_fn => {
+          ast::item_fn(_, purity, _, _) if purity == ast::unsafe_fn => {
             cx.sess.span_fatal(
                 i.span,
                 ~"unsafe functions cannot be used for tests");

branches/incoming/src/rustc/metadata/encoder.rs

@@ -990,7 +990,7 @@ fn synthesize_crate_attrs(ecx: @encode_ctxt, crate: @crate) -> ~[attribute] {
                 attr
             } else {
                 match attr.node.value.node {
-                  meta_list(n, l) => {
+                  meta_list(_, l) => {
                     found_link_attr = true;;
                     synthesize_link_attr(ecx, l)
                   }

branches/incoming/src/rustc/middle/lang_items.rs

@@ -187,7 +187,7 @@ struct LanguageItemCollector {
                 none => {
                     self.session.err(fmt!("no item found for `%s`", key));
                 }
-                some(did) => {
+                some(_) => {
                     // OK.
                 }
             }

branches/incoming/src/rustc/middle/resolve3.rs

@@ -729,7 +729,7 @@ struct Resolver {
     fn visibility_to_privacy(visibility: visibility) -> Privacy {
         match visibility {
             inherited | public => Public,
-            privacy => Private
+            private => Private
         }
     }
 

branches/incoming/src/rustc/util/ppaux.rs

@@ -179,10 +179,10 @@ fn region_to_str(cx: ctxt, region: region) -> ~str {
     // to fit that into a short string.  Hence the recommendation to use
     // `explain_region()` or `note_and_explain_region()`.
     match region {
-      re_scope(node_id) => ~"&",
+      re_scope(_) => ~"&",
       re_bound(br) => bound_region_to_str(cx, br),
-      re_free(id, br) => bound_region_to_str(cx, br),
-      re_var(id)    => ~"&",
+      re_free(_, br) => bound_region_to_str(cx, br),
+      re_var(_)    => ~"&",
       re_static     => ~"&static"
     }
 }