Skip to content

Commit 1bb0f13

Browse files
committed
---
yaml --- r: 51450 b: refs/heads/incoming c: 787f5bb h: refs/heads/master v: v3
1 parent 0938f92 commit 1bb0f13

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 8eb2bab100b42f0ba751552d8eff00eb2134c55a
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/incoming: 42f95d055c2f22078f5c94c0d0ca229e1561ccb8
9+
refs/heads/incoming: 787f5bb0dbbbd50f59848f6703bd89438e60053f
1010
refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/lint.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,12 @@ fn check_item(i: @ast::item, cx: ty::ctxt) {
498498
// not traverse into subitems, since that is handled by the outer
499499
// lint visitor.
500500
fn item_stopping_visitor<E>(v: visit::vt<E>) -> visit::vt<E> {
501-
visit::mk_vt(@visit::Visitor {visit_item: |_i, _e, _v| { },.. **v})
501+
visit::mk_vt(@visit::Visitor {visit_item: |_i, _e, _v| { },
502+
.. **(ty_stopping_visitor(v))})
503+
}
504+
505+
fn ty_stopping_visitor<E>(v: visit::vt<E>) -> visit::vt<E> {
506+
visit::mk_vt(@visit::Visitor {visit_ty: |_t, _e, _v| { },.. **v})
502507
}
503508

504509
fn check_item_while_true(cx: ty::ctxt, it: @ast::item) {

branches/incoming/src/libsyntax/fold.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,10 +622,10 @@ pub fn noop_fold_ty(t: &ty_, fld: @ast_fold) -> ty_ {
622622
}
623623
ty_tup(ref tys) => ty_tup(tys.map(|ty| fld.fold_ty(*ty))),
624624
ty_path(path, id) => ty_path(fld.fold_path(path), fld.new_id(id)),
625-
ty_fixed_length_vec(ref mt, vs) => {
625+
ty_fixed_length_vec(ref mt, e) => {
626626
ty_fixed_length_vec(
627627
fold_mt(mt, fld),
628-
vs
628+
fld.fold_expr(e)
629629
)
630630
}
631631
ty_mac(ref mac) => ty_mac(fold_mac(*mac))

branches/incoming/src/libsyntax/visit.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,10 @@ pub fn visit_ty<E>(t: @Ty, e: E, v: vt<E>) {
246246
(v.visit_ty)(f.decl.output, e, v);
247247
},
248248
ty_path(p, _) => visit_path(p, e, v),
249-
ty_fixed_length_vec(ref mt, _) => (v.visit_ty)(mt.ty, e, v),
249+
ty_fixed_length_vec(ref mt, ex) => {
250+
(v.visit_ty)(mt.ty, e, v);
251+
(v.visit_expr)(ex, e, v);
252+
},
250253
ty_nil | ty_bot | ty_mac(_) | ty_infer => ()
251254
}
252255
}

0 commit comments

Comments
 (0)