---

yaml
---
r: 214902
b: refs/heads/beta
c: dbfc8c5
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[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: 42c5c982c4589d4e1f480407d29769f176f4e104
+refs/heads/beta: dbfc8c5a0711a0746d0af8fdf798f3fc631c83b6
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 8c0aa6d64ebab528f7eb182812007155d6044972
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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: