Merge conflict: port default impls code

2015-02-24 11:49:50 -05:00 · 2015-02-24 11:49:50 -05:00 · eb77fe9e06
commit eb77fe9e06
parent 31e09f740a
1 changed files with 1 additions and 1 deletions
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@ -907,7 +907,7 @@ fn convert_item(ccx: &CrateCtxt, it: &ast::Item) {
                                   &enum_definition.variants);
        },
        ast::ItemDefaultImpl(_, ref ast_trait_ref) => {
-            let trait_ref = astconv::instantiate_trait_ref(ccx,
+            let trait_ref = astconv::instantiate_trait_ref(&ccx.icx(&()),
                                                           &ExplicitRscope,
                                                           ast_trait_ref,
                                                           Some(it.id),