Skip to content

Commit 9b77e4f

Browse files
committed
---
yaml --- r: 28079 b: refs/heads/try c: 09df8f1 h: refs/heads/master i: 28077: 2fb703e 28075: 4b83c2e 28071: 9b70e5a 28063: 1707926 v: v3
1 parent 9a6a286 commit 9b77e4f

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5-
refs/heads/try: 0cece20ea5beb97ce31408a363c01cc34e62424b
5+
refs/heads/try: 09df8f1abfdca35f39a2e013290372552a8f9cc2
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ fn pretty_print_input(sess: session, cfg: ast::crate_cfg, input: input,
272272
ppm: pp_mode) {
273273
fn ann_paren_for_expr(node: pprust::ann_node) {
274274
match node {
275-
pprust::node_expr(s, expr) => pprust::popen(s),
275+
pprust::node_expr(s, _) => pprust::popen(s),
276276
_ => ()
277277
}
278278
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fn fold_item(cx: test_ctxt, &&i: @ast::item, fld: fold::ast_fold) ->
105105

106106
if is_test_fn(i) {
107107
match i.node {
108-
ast::item_fn(decl, purity, _, _) if purity == ast::unsafe_fn => {
108+
ast::item_fn(_, purity, _, _) if purity == ast::unsafe_fn => {
109109
cx.sess.span_fatal(
110110
i.span,
111111
~"unsafe functions cannot be used for tests");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,7 +990,7 @@ fn synthesize_crate_attrs(ecx: @encode_ctxt, crate: @crate) -> ~[attribute] {
990990
attr
991991
} else {
992992
match attr.node.value.node {
993-
meta_list(n, l) => {
993+
meta_list(_, l) => {
994994
found_link_attr = true;;
995995
synthesize_link_attr(ecx, l)
996996
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ struct LanguageItemCollector {
187187
none => {
188188
self.session.err(fmt!("no item found for `%s`", key));
189189
}
190-
some(did) => {
190+
some(_) => {
191191
// OK.
192192
}
193193
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ struct Resolver {
729729
fn visibility_to_privacy(visibility: visibility) -> Privacy {
730730
match visibility {
731731
inherited | public => Public,
732-
privacy => Private
732+
private => Private
733733
}
734734
}
735735

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,10 @@ fn region_to_str(cx: ctxt, region: region) -> ~str {
179179
// to fit that into a short string. Hence the recommendation to use
180180
// `explain_region()` or `note_and_explain_region()`.
181181
match region {
182-
re_scope(node_id) => ~"&",
182+
re_scope(_) => ~"&",
183183
re_bound(br) => bound_region_to_str(cx, br),
184-
re_free(id, br) => bound_region_to_str(cx, br),
185-
re_var(id) => ~"&",
184+
re_free(_, br) => bound_region_to_str(cx, br),
185+
re_var(_) => ~"&",
186186
re_static => ~"&static"
187187
}
188188
}

0 commit comments

Comments
 (0)