---

yaml
---
r: 14176
b: refs/heads/try
c: 74d4e2a
h: refs/heads/master
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: d01e7cd3406e612f363f95d44291839fc53640d1
+refs/heads/try: 74d4e2a32ed28bf2272b1ba3246246557ec6d987
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/comp/middle/typeck.rs

@@ -1589,25 +1589,25 @@ fn lookup_method(fcx: @fn_ctxt, expr: @ast::expr, node_id: ast::node_id,
         let substs = substs, n_tps = vec::len(substs), n_tys = vec::len(tps);
         let has_self = ty::type_has_params(fty);
         if method_n_tps + n_tps > 0u {
-            if n_tys > 0u {
+            if n_tys == 0u || n_tys != method_n_tps {
                 if n_tys != method_n_tps {
-                    tcx.sess.span_fatal
+                    tcx.sess.span_err
                         (expr.span, "incorrect number of type \
                                      parameters given for this method");
 
                 }
-                substs += tps;
-            } else {
                 substs += vec::init_fn(method_n_tps, {|_i|
                     ty::mk_var(tcx, next_ty_var_id(fcx))
                 });
-            };
+            } else {
+                substs += tps;
+            }
             write_ty_substs(tcx, node_id, fty, substs);
-        } else if n_tys > 0u {
-            tcx.sess.span_fatal(expr.span,
-                                "this method does not take type \
-                                 parameters");
         } else {
+            if n_tys > 0u {
+                tcx.sess.span_err(expr.span, "this method does not take type \
+                                              parameters");
+            }
             write_ty(tcx, node_id, fty);
         }
         if has_self && !option::is_none(self_sub) {

branches/try/src/test/compile-fail/iface-test-2.rs

@@ -0,0 +1,11 @@
+iface bar { fn dup() -> self; fn blah<X>(); }
+impl of bar for int { fn dup() -> int { self } fn blah<X>() {} }
+impl of bar for uint { fn dup() -> uint { self } fn blah<X>() {} }
+impl of bar for uint { fn dup() -> uint { self } fn blah<X>() {} }
+
+fn main() {
+    10.dup::<int>(); //! ERROR does not take type parameters
+    10.blah::<int, int>(); //! ERROR incorrect number of type parameters
+    10u.dup(); //! ERROR multiple applicable methods
+    (10 as bar).dup(); //! ERROR contains a self type
+}

branches/try/src/test/compile-fail/iface-test.rs

@@ -0,0 +1,9 @@
+iface foo { fn foo(); }
+
+impl of foo for uint {} //! ERROR missing method `foo`
+
+impl of foo for uint { fn foo() -> int {} } //! ERROR incompatible type
+
+impl of int for uint { fn foo() {} } //! ERROR can only implement interface
+
+fn main() {}