---

yaml
---
r: 15287
b: refs/heads/try
c: 90d3f0f
h: refs/heads/master
i:
  15285: 9ef8463
  15283: 5d5fe9d
  15279: 78578c0
v: v3

Author: marijnh

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fabd49bc2d13d169f55916cc722d45651a0be50b
+refs/heads/try: 90d3f0fb5e8512a3024a7ece53c8c200e8e12e28
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/infer.rs

@@ -1341,10 +1341,6 @@ impl of combine for glb {
         ok(ty::mk_bot(self.infcx().tcx))
     }
 
-    fn c_regions(a: ty::region, _b: ty::region) -> cres<ty::region> {
-        ok(a) // FIXME
-    }
-
     fn c_mts(a: ty::mt, b: ty::mt) -> cres<ty::mt> {
         let tcx = self.infcx().tcx;
 

branches/try/src/rustc/middle/resolve.rs

@@ -1727,13 +1727,21 @@ fn check_item(e: @env, i: @ast::item, &&x: (), v: vt<()>) {
     alt i.node {
       ast::item_fn(decl, ty_params, _) {
         check_fn(*e, i.span, decl);
-        ensure_unique(*e, i.span, typaram_names(ty_params), ident_id,
+        ensure_unique(*e, i.span, ty_params, {|tp| tp.ident},
                       "type parameter");
       }
       ast::item_enum(_, ty_params) {
-        ensure_unique(*e, i.span, typaram_names(ty_params), ident_id,
+        ensure_unique(*e, i.span, ty_params, {|tp| tp.ident},
                       "type parameter");
       }
+      ast::item_iface(_, methods) {
+        ensure_unique(*e, i.span, methods, {|m| m.ident},
+                      "method");
+      }
+      ast::item_impl(_, _, _, methods) {
+        ensure_unique(*e, i.span, methods, {|m| m.ident},
+                      "method");
+      }
       _ { }
     }
 }
@@ -1871,8 +1879,6 @@ fn add_name(ch: checker, sp: span, name: ident) {
     ch.seen += [name];
 }
 
-fn ident_id(&&i: ident) -> ident { ret i; }
-
 fn ensure_unique<T>(e: env, sp: span, elts: [T], id: fn(T) -> ident,
                     kind: str) {
     let ch = checker(e, kind);