Skip to content

Commit 820a4f9

Browse files
committed
---
yaml --- r: 135761 b: refs/heads/auto c: 073a1ab h: refs/heads/master i: 135759: 69a4d15 v: v3
1 parent babe73d commit 820a4f9

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 042cdeefc7708291057770ddd5becf14288dad71
16+
refs/heads/auto: 073a1abff28c01a541d96a5c7b1bbc5c9c9d0401
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/typeck/check/mod.rs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -693,16 +693,6 @@ pub fn check_item(ccx: &CrateCtxt, it: &ast::Item) {
693693
debug!("ItemImpl {} with id {}", token::get_ident(it.ident), it.id);
694694

695695
let impl_pty = ty::lookup_item_type(ccx.tcx, ast_util::local_def(it.id));
696-
for impl_item in impl_items.iter() {
697-
match *impl_item {
698-
ast::MethodImplItem(ref m) => {
699-
check_method_body(ccx, &impl_pty.generics, &**m);
700-
}
701-
ast::TypeImplItem(_) => {
702-
// Nothing to do here.
703-
}
704-
}
705-
}
706696

707697
match *opt_trait_ref {
708698
Some(ref ast_trait_ref) => {
@@ -717,6 +707,17 @@ pub fn check_item(ccx: &CrateCtxt, it: &ast::Item) {
717707
None => { }
718708
}
719709

710+
for impl_item in impl_items.iter() {
711+
match *impl_item {
712+
ast::MethodImplItem(ref m) => {
713+
check_method_body(ccx, &impl_pty.generics, &**m);
714+
}
715+
ast::TypeImplItem(_) => {
716+
// Nothing to do here.
717+
}
718+
}
719+
}
720+
720721
}
721722
ast::ItemTrait(_, _, _, ref trait_methods) => {
722723
let trait_def = ty::lookup_trait_def(ccx.tcx, local_def(it.id));

0 commit comments

Comments
 (0)