---

yaml
---
r: 211816
b: refs/heads/auto
c: dbfc8c5
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[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: 42c5c982c4589d4e1f480407d29769f176f4e104
+refs/heads/auto: dbfc8c5a0711a0746d0af8fdf798f3fc631c83b6
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/diagnostics.rs

@@ -177,9 +177,9 @@ the heap at runtime, and therefore cannot be done at compile time.
 "##,
 
 E0011: r##"
-Using a user-defined operator on const/static variable is restricted to what
-can be evaluated at compile-time. Using an user-defined operator could call a
-user-defined function, which is not allowed.
+Initializers for constants and statics are evaluated at compile time.
+User-defined operators rely on user-defined functions, which cannot be evaluated
+at compile time.
 
 Bad example: