about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2015-06-01 12:33:41 +0200
committerGuillaume Gomez <guillaume1.gomez@gmail.com>2015-06-01 12:33:41 +0200
commitdbfc8c5a0711a0746d0af8fdf798f3fc631c83b6 (patch)
tree94eb5271c5bad0dcd59fefd41613108ab949c1ae
parent42c5c982c4589d4e1f480407d29769f176f4e104 (diff)
downloadrust-dbfc8c5a0711a0746d0af8fdf798f3fc631c83b6.tar.gz
rust-dbfc8c5a0711a0746d0af8fdf798f3fc631c83b6.zip
Update diagnostics.rs
-rw-r--r--src/librustc/diagnostics.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/diagnostics.rs b/src/librustc/diagnostics.rs
index e1034976589..5e79e5a5a4e 100644
--- a/src/librustc/diagnostics.rs
+++ b/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: