OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fold context into TransItemVisitor.

This commit is contained in:
Felix S. Klock II 2013-09-25 10:58:40 +02:00
parent 411dce85ea
commit 2ceebf1070
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/librustc/middle/trans/base.rs
View File

@ -2194,11 +2194,13 @@ pub fn trans_enum_def(ccx: @mut CrateContext, enum_definition: &ast::enum_def,
}
}
pub struct TransItemVisitor;
pub struct TransItemVisitor {
ccx: @mut CrateContext,
}
impl Visitor<@mut CrateContext> for TransItemVisitor {
fn visit_item(&mut self, i: @ast::item, ccx: @mut CrateContext) {
trans_item(ccx, i);
impl Visitor<()> for TransItemVisitor {
fn visit_item(&mut self, i: @ast::item, _:()) {
trans_item(self.ccx, i);
}
}
@ -2235,8 +2237,8 @@ pub fn trans_item(ccx: @mut CrateContext, item: &ast::item) {
} else {
// Be sure to travel more than just one layer deep to catch nested
// items in blocks and such.
let mut v = TransItemVisitor;
v.visit_block(body, ccx);
let mut v = TransItemVisitor{ ccx: ccx };
v.visit_block(body, ());
}
}
ast::item_impl(ref generics, _, _, ref ms) => {
@ -2288,8 +2290,8 @@ pub fn trans_item(ccx: @mut CrateContext, item: &ast::item) {
// functions, but the trait still needs to be walked. Otherwise default
// methods with items will not get translated and will cause ICE's when
// metadata time comes around.
let mut v = TransItemVisitor;
visit::walk_item(&mut v, item, ccx);
let mut v = TransItemVisitor{ ccx: ccx };
visit::walk_item(&mut v, item, ());
}
_ => {/* fall through */ }
}

8
src/librustc/middle/trans/meth.rs
View File

@ -61,9 +61,9 @@ pub fn trans_impl(ccx: @mut CrateContext,
// Both here and below with generic methods, be sure to recurse and look for
// items that we need to translate.
if !generics.ty_params.is_empty() {
let mut v = TransItemVisitor;
let mut v = TransItemVisitor{ ccx: ccx };
for method in methods.iter() {
visit::walk_method_helper(&mut v, *method, ccx);
visit::walk_method_helper(&mut v, *method, ());
}
return;
}
@ -80,8 +80,8 @@ pub fn trans_impl(ccx: @mut CrateContext,
None,
llfn);
} else {
let mut v = TransItemVisitor;
visit::walk_method_helper(&mut v, *method, ccx);
let mut v = TransItemVisitor{ ccx: ccx };
visit::walk_method_helper(&mut v, *method, ());
}
}
}