---

yaml
---
r: 214727
b: refs/heads/beta
c: 8db699d
h: refs/heads/master
i:
  214725: ed56533
  214723: fe6a514
  214719: 3abdae7
v: v3

Author: quantheory

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 98f41ff3555dba80b47ebee6f6bc8a7df697240c
+refs/heads/beta: 8db699d18d263bf779f260ba55221a8c0ff2f5d8
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/check/mod.rs

@@ -3773,9 +3773,9 @@ pub fn resolve_ty_and_def_ufcs<'a, 'b, 'tcx>(fcx: &FnCtxt<'b, 'tcx>,
         match def {
             def::DefAssociatedConst(..) => {
                 if ty::type_has_params(ty) || ty::type_has_self(ty) {
-                    fcx.sess().span_err(span,
-                                        "Associated consts cannot depend \
-                                         on type parameters or Self.");
+                    span_err!(fcx.sess(), span, E0329,
+                              "Associated consts cannot depend \
+                               on type parameters or Self.");
                     fcx.write_error(node_id);
                     return true;
                 }

branches/beta/src/librustc_typeck/diagnostics.rs

@@ -771,6 +771,7 @@ register_diagnostics! {
     E0326, // associated const implemented with different type from trait
     E0327, // referred to method instead of constant in match pattern
     E0328, // cannot implement Unsize explicitly
+    E0329, // associated const depends on type parameter or Self.
     E0366, // dropck forbid specialization to concrete type or region
     E0367, // dropck forbid specialization to predicate not in struct/enum
     E0369, // binary operation `<op>` cannot be applied to types

branches/beta/src/test/compile-fail/associated-const-type-parameters.rs

@@ -14,13 +14,13 @@ pub trait Foo {
     const MIN: i32;
 
     fn get_min() -> i32 {
-        Self::MIN //~ Associated consts cannot depend on type parameters or Self.
+        Self::MIN //~ ERROR E0329
     }
 }
 
 fn get_min<T: Foo>() -> i32 {
-    T::MIN; //~ Associated consts cannot depend on type parameters or Self.
-    <T as Foo>::MIN //~ Associated consts cannot depend on type parameters or Self.
+    T::MIN; //~ ERROR E0329
+    <T as Foo>::MIN //~ ERROR E0329
 }
 
 fn main() {}