Skip to content

Instantly share code, notes, and snippets.

@nikomatsakis
Created May 18, 2012 18:55
Show Gist options
  • Save nikomatsakis/2727036 to your computer and use it in GitHub Desktop.
Save nikomatsakis/2727036 to your computer and use it in GitHub Desktop.
diff --git a/src/rustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs
index 069fc7f..b071e25 100644
--- a/src/rustc/middle/typeck/check.rs
+++ b/src/rustc/middle/typeck/check.rs
@@ -66,9 +66,8 @@ type parameter).
*/
-import astconv::{ast_conv, region_scope, empty_rscope, ast_ty_to_ty,
- in_anon_rscope};
-import collect::{methods}; // ccx.to_ty()
+import astconv::{region_scope, empty_rscope, ast_ty_to_ty, in_anon_rscope};
+import collect::{ast_conv, methods}; // ccx.to_ty()
import method::{methods}; // methods for method::lookup
import regionmanip::{universally_quantify_regions_before_call,
region_of, replace_bound_regions,
@@ -339,7 +338,7 @@ fn class_types(ccx: @crate_ctxt, members: [@ast::class_member],
for members.each { |m|
alt m.node {
ast::instance_var(_,t,_,id,_) {
- rslt.insert(id, ccx.to_ty(rs, t));
+ rslt.insert(id, ast_ty_to_ty(ccx, rs, t));
}
ast::class_method(mth) {
rslt.insert(mth.id,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment