---

yaml
---
r: 209302
b: refs/heads/auto
c: 8db699d
h: refs/heads/master
v: v3

Author: quantheory

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 98f41ff3555dba80b47ebee6f6bc8a7df697240c
+refs/heads/auto: 8db699d18d263bf779f260ba55221a8c0ff2f5d8
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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/auto/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/auto/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() {}