---

yaml
---
r: 40410
b: refs/heads/dist-snap
c: 82017b8
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: f9ca0c89d8d91a71d14a980037f3d7e555667515
+refs/heads/dist-snap: 82017b8416798b4ad46c1b7416611b353374051a
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/librustc/middle/typeck/collect.rs

@@ -296,11 +296,27 @@ fn compare_impl_method(tcx: ty::ctxt,
     // implementable by an `&const self` method (the impl assumes less
     // than the trait provides).
     if impl_m.self_ty != trait_m.self_ty {
-        tcx.sess.span_err(
-            cm.span,
-            fmt!("method `%s`'s self type does \
-                  not match the trait method's \
-                  self type", tcx.sess.str_of(impl_m.ident)));
+        if impl_m.self_ty == ast::sty_static {
+            // Needs to be a fatal error because otherwise,
+            // method::transform_self_type_for_method ICEs
+            tcx.sess.span_fatal(cm.span,
+                 fmt!("method `%s` is declared as \
+                       static in its impl, but not in \
+                       its trait", tcx.sess.str_of(impl_m.ident)));
+        }
+        else if trait_m.self_ty == ast::sty_static {
+            tcx.sess.span_fatal(cm.span,
+                 fmt!("method `%s` is declared as \
+                       static in its trait, but not in \
+                       its impl", tcx.sess.str_of(impl_m.ident)));
+        }
+        else {
+            tcx.sess.span_err(
+                cm.span,
+                fmt!("method `%s`'s self type does \
+                      not match the trait method's \
+                      self type", tcx.sess.str_of(impl_m.ident)));
+        }
     }
 
     if impl_m.tps.len() != trait_m.tps.len() {
@@ -348,9 +364,6 @@ fn compare_impl_method(tcx: ty::ctxt,
                     pluralize(trait_param_bounds.len(), ~"bound")));
            return;
         }
-        // tjc: I'm mildly worried that there's something I'm
-        // not checking that require_same_types doesn't catch,
-        // but I can't figure out what.
     }
 
     // Replace any references to the self region in the self type with

branches/dist-snap/src/test/compile-fail/issue-3969.rs

@@ -0,0 +1,15 @@
+struct Bike {
+    name: ~str,
+}
+
+trait BikeMethods {
+    fn woops(&const self) -> ~str;
+}
+
+pub impl Bike : BikeMethods {
+    static fn woops(&const self) -> ~str { ~"foo" }
+    //~^ ERROR method `woops` is declared as static in its impl, but not in its trait
+}
+
+pub fn main() {
+}

branches/dist-snap/src/test/compile-fail/staticness-mismatch.rs

@@ -4,7 +4,7 @@ trait foo {
 }
 
 impl int: foo {
-    fn bar() {} //~ ERROR self type does not match the trait method's
+    fn bar() {} //~ ERROR method `bar` is declared as static in its trait, but not in its impl
 }
 
 fn main() {}