---

yaml
---
r: 218858
b: refs/heads/snap-stage3
c: dbfc8c5
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: c044791d80ea0dc5c4b57b6030a67b69f8510239
-refs/heads/snap-stage3: 42c5c982c4589d4e1f480407d29769f176f4e104
+refs/heads/snap-stage3: dbfc8c5a0711a0746d0af8fdf798f3fc631c83b6
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/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: