Skip to content

Commit aa49d01

Browse files
ericktnikomatsakis
erickt
authored and
nikomatsakis
committed
---
yaml --- r: 30124 b: refs/heads/incoming c: 5ce5ee8 h: refs/heads/master v: v3
1 parent ab72744 commit aa49d01

File tree

14 files changed

+36
-36
lines changed

14 files changed

+36
-36
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 1dc92d44be45f125265f98914dc3b5ee9b7e77a2
9+
refs/heads/incoming: 5ce5ee86bc1264fe17f96606d648409b9508e4a3
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/incoming/src/rustc/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn visit_view_item(e: env, i: @ast::view_item) {
109109

110110
fn visit_item(e: env, i: @ast::item) {
111111
match i.node {
112-
ast::item_foreign_mod(m) => {
112+
ast::item_foreign_mod(_) => {
113113
match attr::foreign_abi(i.attrs) {
114114
either::Right(abi) => {
115115
if abi != ast::foreign_abi_cdecl &&

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
519519
encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
520520
ebml_w.end_tag();
521521
}
522-
item_fn(decl, purity, tps, _) => {
522+
item_fn(_, purity, tps, _) => {
523523
add_to_index();
524524
ebml_w.start_tag(tag_items_data_item);
525525
encode_def_id(ebml_w, local_def(item.id));
@@ -630,7 +630,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::writer, item: @item,
630630
needs to know*/
631631
for struct_def.fields.each |f| {
632632
match f.node.kind {
633-
named_field(ident, mutability, vis) => {
633+
named_field(ident, _, vis) => {
634634
ebml_w.start_tag(tag_item_field);
635635
encode_visibility(ebml_w, vis);
636636
encode_name(ecx, ebml_w, ident);
@@ -790,7 +790,7 @@ fn encode_info_for_foreign_item(ecx: @encode_ctxt, ebml_w: ebml::writer,
790790

791791
ebml_w.start_tag(tag_items_data_item);
792792
match nitem.node {
793-
foreign_item_fn(fn_decl, purity, tps) => {
793+
foreign_item_fn(_, purity, tps) => {
794794
encode_def_id(ebml_w, local_def(nitem.id));
795795
encode_family(ebml_w, purity_fn_family(purity));
796796
encode_type_param_bounds(ebml_w, ecx, tps);
@@ -803,7 +803,7 @@ fn encode_info_for_foreign_item(ecx: @encode_ctxt, ebml_w: ebml::writer,
803803
}
804804
encode_path(ecx, ebml_w, path, ast_map::path_name(nitem.ident));
805805
}
806-
foreign_item_const(t) => {
806+
foreign_item_const(*) => {
807807
encode_def_id(ebml_w, local_def(nitem.id));
808808
encode_family(ebml_w, 'c');
809809
encode_type(ecx, ebml_w, node_id_to_type(ecx.tcx, nitem.id));

‎branches/incoming/src/rustc/metadata/filesearch.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ fn mk_filesearch(maybe_sysroot: Option<Path>,
4444
self.target_triple));
4545
match get_cargo_lib_path_nearest() {
4646
result::ok(p) => vec::push(paths, p),
47-
result::err(p) => ()
47+
result::err(_) => ()
4848
}
4949
match get_cargo_lib_path() {
5050
result::ok(p) => vec::push(paths, p),
51-
result::err(p) => ()
51+
result::err(_) => ()
5252
}
5353
paths
5454
}

‎branches/incoming/src/rustc/middle/freevars.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ fn collect_freevars(def_map: resolve3::DefMap, blk: ast::blk)
3939

4040
let walk_expr = fn@(expr: @ast::expr, &&depth: int, v: visit::vt<int>) {
4141
match expr.node {
42-
ast::expr_fn(proto, decl, _, _) => {
42+
ast::expr_fn(proto, _, _, _) => {
4343
if proto != ast::proto_bare {
4444
visit::visit_expr(expr, depth + 1, v);
4545
}
4646
}
4747
ast::expr_fn_block(*) => {
4848
visit::visit_expr(expr, depth + 1, v);
4949
}
50-
ast::expr_path(path) => {
50+
ast::expr_path(*) => {
5151
let mut i = 0;
5252
match def_map.find(expr.id) {
5353
None => fail ~"path not found",

‎branches/incoming/src/rustc/middle/region.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ fn resolve_arm(arm: ast::arm, cx: ctxt, visitor: visit::vt<ctxt>) {
216216

217217
fn resolve_pat(pat: @ast::pat, cx: ctxt, visitor: visit::vt<ctxt>) {
218218
match pat.node {
219-
ast::pat_ident(_, path, _) => {
219+
ast::pat_ident(*) => {
220220
let defn_opt = cx.def_map.find(pat.id);
221221
match defn_opt {
222222
Some(ast::def_variant(_,_)) => {
@@ -239,8 +239,8 @@ fn resolve_stmt(stmt: @ast::stmt, cx: ctxt, visitor: visit::vt<ctxt>) {
239239
ast::stmt_decl(*) => {
240240
visit::visit_stmt(stmt, cx, visitor);
241241
}
242-
ast::stmt_expr(expr, stmt_id) |
243-
ast::stmt_semi(expr, stmt_id) => {
242+
ast::stmt_expr(_, stmt_id) |
243+
ast::stmt_semi(_, stmt_id) => {
244244
record_parent(cx, stmt_id);
245245
let mut expr_cx = cx;
246246
expr_cx.parent = Some(stmt_id);
@@ -259,7 +259,7 @@ fn resolve_expr(expr: @ast::expr, cx: ctxt, visitor: visit::vt<ctxt>) {
259259
cx.sess.intr()));
260260
new_cx.parent = Some(expr.id);
261261
}
262-
ast::expr_match(subexpr, _) => {
262+
ast::expr_match(*) => {
263263
debug!("node %d: %s", expr.id, pprust::expr_to_str(expr,
264264
cx.sess.intr()));
265265
new_cx.parent = Some(expr.id);

‎branches/incoming/src/rustc/middle/trans/alt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
628628
kind = switch;
629629
}
630630
}
631-
lit(l) => {
631+
lit(_) => {
632632
test_val = Load(bcx, val);
633633
let pty = node_id_type(bcx, pat_id);
634634
kind = if ty::type_is_integral(pty) { switch }
@@ -940,7 +940,7 @@ fn bind_irrefutable_pat(bcx: block, pat: @ast::pat, val: ValueRef,
940940
// Grab the class data that we care about.
941941
let class_fields, class_id;
942942
match ty::get(node_id_type(bcx, pat.id)).struct {
943-
ty::ty_class(cid, substs) => {
943+
ty::ty_class(cid, _) => {
944944
class_id = cid;
945945
class_fields = ty::lookup_class_fields(ccx.tcx, class_id);
946946
}

‎branches/incoming/src/rustc/middle/trans/base.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2396,7 +2396,7 @@ fn maybe_instantiate_inline(ccx: @crate_ctxt, fn_id: ast::def_id)
23962396
trans_item(ccx, *item);
23972397
local_def(item.id)
23982398
}
2399-
csearch::found(ast::ii_ctor(ctor, _, tps, _)) => {
2399+
csearch::found(ast::ii_ctor(ctor, _, _, _)) => {
24002400
ccx.external.insert(fn_id, Some(ctor.node.id));
24012401
local_def(ctor.node.id)
24022402
}
@@ -2440,7 +2440,7 @@ fn maybe_instantiate_inline(ccx: @crate_ctxt, fn_id: ast::def_id)
24402440
}
24412441
local_def(mth.id)
24422442
}
2443-
csearch::found(ast::ii_dtor(dtor, _, tps, _)) => {
2443+
csearch::found(ast::ii_dtor(dtor, _, _, _)) => {
24442444
ccx.external.insert(fn_id, Some(dtor.node.id));
24452445
local_def(dtor.node.id)
24462446
}
@@ -5425,7 +5425,7 @@ fn get_item_val(ccx: @crate_ctxt, id: ast::node_id) -> ValueRef {
54255425
ccx.item_symbols.insert(i.id, s);
54265426
g
54275427
}
5428-
ast::item_fn(decl, purity, _, _) => {
5428+
ast::item_fn(_, purity, _, _) => {
54295429
let llfn = if purity != ast::extern_fn {
54305430
register_fn(ccx, i.span, my_path, i.id)
54315431
} else {
@@ -5671,7 +5671,7 @@ fn push_rtcall(ccx: @crate_ctxt, name: ~str, did: ast::def_id) {
56715671
fn gather_local_rtcalls(ccx: @crate_ctxt, crate: @ast::crate) {
56725672
visit::visit_crate(*crate, (), visit::mk_simple_visitor(@{
56735673
visit_item: |item| match item.node {
5674-
ast::item_fn(decl, _, _, _) => {
5674+
ast::item_fn(*) => {
56755675
let attr_metas = attr::attr_metas(
56765676
attr::find_attrs_by_name(item.attrs, ~"rt"));
56775677
do vec::iter(attr_metas) |attr_meta| {

‎branches/incoming/src/rustc/middle/trans/closure.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ enum environment_value {
100100

101101
fn ev_to_str(ccx: @crate_ctxt, ev: environment_value) -> ~str {
102102
match ev {
103-
env_copy(v, t, lk) => fmt!("copy(%s,%s)", val_str(ccx.tn, v),
103+
env_copy(v, t, _) => fmt!("copy(%s,%s)", val_str(ccx.tn, v),
104104
ty_to_str(ccx.tcx, t)),
105-
env_move(v, t, lk) => fmt!("move(%s,%s)", val_str(ccx.tn, v),
105+
env_move(v, t, _) => fmt!("move(%s,%s)", val_str(ccx.tn, v),
106106
ty_to_str(ccx.tcx, t)),
107-
env_ref(v, t, lk) => fmt!("ref(%s,%s)", val_str(ccx.tn, v),
108-
ty_to_str(ccx.tcx, t))
107+
env_ref(v, t, _) => fmt!("ref(%s,%s)", val_str(ccx.tn, v),
108+
ty_to_str(ccx.tcx, t))
109109
}
110110
}
111111

@@ -224,13 +224,13 @@ fn store_environment(bcx: block,
224224
let src = {bcx:bcx, val:val, kind:kind};
225225
bcx = move_val(bcx, INIT, bound_data, src, ty);
226226
}
227-
env_ref(val, ty, lv_owned) => {
227+
env_ref(val, _, lv_owned) => {
228228
debug!("> storing %s into %s",
229229
val_str(bcx.ccx().tn, val),
230230
val_str(bcx.ccx().tn, bound_data));
231231
Store(bcx, val, bound_data);
232232
}
233-
env_ref(val, ty, lv_owned_imm) => {
233+
env_ref(val, _, lv_owned_imm) => {
234234
let addr = do_spill_noroot(bcx, val);
235235
Store(bcx, addr, bound_data);
236236
}

‎branches/incoming/src/rustc/middle/trans/foreign.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ fn trans_foreign_mod(ccx: @crate_ctxt,
755755

756756
for vec::each(foreign_mod.items) |foreign_item| {
757757
match foreign_item.node {
758-
ast::foreign_item_fn(fn_decl, purity, typarams) => {
758+
ast::foreign_item_fn(_, _, typarams) => {
759759
let id = foreign_item.id;
760760
if abi != ast::foreign_abi_rust_intrinsic {
761761
let llwrapfn = get_item_val(ccx, id);

‎branches/incoming/src/rustc/middle/trans/impl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,12 @@ fn trans_monomorphized_callee(bcx: block, callee_id: ast::node_id,
258258
ccx, node_id_type(bcx, callee_id))))
259259
with lval}
260260
}
261-
typeck::vtable_trait(trait_id, tps) => {
261+
typeck::vtable_trait(*) => {
262262
let {bcx, val} = trans_temp_expr(bcx, base);
263263
let fty = node_id_type(bcx, callee_id);
264264
trans_trait_callee(bcx, val, fty, n_method)
265265
}
266-
typeck::vtable_param(n_param, n_bound) => {
266+
typeck::vtable_param(*) => {
267267
fail ~"vtable_param left in monomorphized function's vtable substs";
268268
}
269269
}

‎branches/incoming/src/rustc/middle/trans/shape.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> ~[u8] {
267267
add_substr(s, shape_of(ccx, mt.ty));
268268
s
269269
}
270-
ty::ty_evec(mt, ty::vstore_uniq) => {
270+
ty::ty_evec(_, ty::vstore_uniq) => {
271271
shape_of(ccx, tvec::expand_boxed_vec_ty(ccx.tcx, t))
272272
}
273273

@@ -290,7 +290,7 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> ~[u8] {
290290
s
291291
}
292292

293-
ty::ty_estr(ty::vstore_slice(r)) => {
293+
ty::ty_estr(ty::vstore_slice(_)) => {
294294
let mut s = ~[shape_slice];
295295
let u8_t = ty::mk_mach_uint(ccx.tcx, ast::ty_u8);
296296
add_bool(s, true); // is_pod
@@ -299,7 +299,7 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t) -> ~[u8] {
299299
s
300300
}
301301

302-
ty::ty_evec(mt, ty::vstore_slice(r)) => {
302+
ty::ty_evec(mt, ty::vstore_slice(_)) => {
303303
let mut s = ~[shape_slice];
304304
add_bool(s, ty::type_is_pod(ccx.tcx, mt.ty));
305305
add_bool(s, false); // is_str

‎branches/incoming/src/rustc/middle/trans/tvec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,10 @@ fn trans_vstore(bcx: block, e: @ast::expr,
268268
ast::expr_lit(@{node: ast::lit_str(s), span: _}) => {
269269
return trans_estr(bcx, s, Some(v), dest);
270270
}
271-
ast::expr_vec(es, mutbl) => {
271+
ast::expr_vec(es, _) => {
272272
return trans_evec(bcx, individual_evec(es), v, e.id, dest);
273273
}
274-
ast::expr_repeat(element, count_expr, mutbl) => {
274+
ast::expr_repeat(element, count_expr, _) => {
275275
let count = ty::eval_repeat_count(bcx.tcx(), count_expr, e.span);
276276
return trans_evec(bcx, repeating_evec(element, count), v, e.id, dest);
277277
}

‎branches/incoming/src/rustc/middle/ty.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1928,7 +1928,7 @@ fn is_instantiable(cx: ctxt, r_ty: t) -> bool {
19281928
return type_requires(cx, seen, r_ty, mt.ty);
19291929
}
19301930
1931-
ty_ptr(mt) => {
1931+
ty_ptr(*) => {
19321932
false // unsafe ptrs can always be NULL
19331933
}
19341934
@@ -2137,7 +2137,7 @@ fn type_is_enum(ty: t) -> bool {
21372137
// constructors
21382138
fn type_is_c_like_enum(cx: ctxt, ty: t) -> bool {
21392139
match get(ty).struct {
2140-
ty_enum(did, ref substs) => {
2140+
ty_enum(did, _) => {
21412141
let variants = enum_variants(cx, did);
21422142
let some_n_ary = vec::any(*variants, |v| vec::len(v.args) > 0u);
21432143
return !some_n_ary;

0 commit comments

Comments
 (0)