fix classes and parameterized ifaces; remove needless self check

ref #1726, #2434

Author: nikomatsakis

src/rustc/driver/driver.rs

@@ -192,8 +192,6 @@ fn compile_upto(sess: session, cfg: ast::crate_cfg,
          bind middle::check_loop::check_crate(ty_cx, crate));
     time(time_passes, "alt checking",
          bind middle::check_alt::check_crate(ty_cx, crate));
-    time(time_passes, "self checking",
-         bind middle::check_self::check_crate(ty_cx, crate));
     time(time_passes, "typestate checking",
          bind middle::tstate::ck::check_crate(ty_cx, crate));
     let (root_map, mutbl_map) = time(

src/rustc/middle/check_self.rs

@@ -359,8 +359,7 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
         // Write the class type
         let tpt = ty_of_item(ccx, it);
         write_ty_to_tcx(tcx, it.id, tpt.ty);
-        tcx.tcache.insert(local_def(it.id), {bounds: tpt.bounds,
-              rp: rp, ty: tpt.ty});
+        tcx.tcache.insert(local_def(it.id), tpt);
         // Write the ctor type
         let t_ctor =
             ty::mk_fn(
@@ -416,13 +415,17 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
         for ifaces.each { |ifce|
             check_methods_against_iface(ccx, tps, rp, selfty,
                                         ifce, methods);
-            let t = ty::node_id_to_type(tcx, ifce.id);
 
-            // FIXME: This assumes classes only implement
-            // non-parameterized ifaces. add a test case for
-            // a class implementing a parameterized iface.
-            // -- tjc (#1726)
-            tcx.tcache.insert(local_def(ifce.id), no_params(t));
+            // FIXME #2434---this is somewhat bogus, but it seems that
+            // the id of iface_ref is also the id of the impl, and so
+            // we want to store the "self type" of the impl---in this
+            // case, the class.  The reason I say this is somewhat
+            // bogus (and should be refactored) is that the tcache
+            // stores the class type for ifce.id but the node_type
+            // table stores the iface type. Weird. Probably just
+            // adding a "self type" table rather than overloading the
+            // tcache would be ok, or else adding more than one id.
+            tcx.tcache.insert(local_def(ifce.id), tpt);
         }
       }
       _ {

src/rustc/middle/typeck/collect.rs

@@ -68,7 +68,6 @@ mod middle {
     mod check_loop;
     mod check_alt;
     mod check_const;
-    mod check_self;
     mod lint;
     mod borrowck;
     mod alias;

src/rustc/rustc.rc

@@ -0,0 +1,23 @@
+use std;
+import std::map::{map, hashmap, int_hash};
+
+class keys<K: copy, V: copy, M: copy map<K,V>>
+    implements iter::base_iter<K> {
+
+    let map: M;
+
+    new(map: M) {
+        self.map = map;
+    }
+
+    fn each(blk: fn(K) -> bool) { self.map.each { |k, _v| blk(k)} }
+    fn size_hint() -> option<uint> { some(self.map.size()) }
+    fn eachi(blk: fn(uint, K) -> bool) { iter::eachi(self, blk) }
+}
+
+fn main() {
+    let m = int_hash();
+    m.insert(1, 2);
+    m.insert(3, 4);
+    assert iter::to_vec(keys(m)) == [1, 3];
+}

src/test/compile-fail/issue-2294.rs

@@ -35,10 +35,14 @@ class cat implements noisy {
   }
 }
 
+fn make_speak<C: noisy>(c: C) {
+    c.speak();
+}
+
 fn main() {
   let nyan = cat(0u, 2, "nyan");
   nyan.eat();
   assert(!nyan.eat());
-  uint::range(1u, 10u, {|_i| nyan.speak(); });
+  uint::range(1u, 10u, {|_i| make_speak(nyan); });
   assert(nyan.eat());
 }