---

yaml
---
r: 211774
b: refs/heads/auto
c: 3640354
h: refs/heads/master
v: v3

Author: Nick Hamann

[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: 7e78e708fb3f5115b47cc1c0b32c77a381519ecc
+refs/heads/auto: 364035497c2bf882cd46a33e0cd6bf4e64370ea4
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/diagnostics.rs

@@ -196,9 +196,9 @@ const Y: i32 = A;
 "##,
 
 E0015: r##"
-The only function calls allowed in static or constant expressions are
-constructors for enum variants and structs, or `const fn`s. Rust currently does
-not support more general compile-time function execution.
+The only functions that can be called in static or constant expressions are
+`const` functions. Rust currently does not support more general compile-time
+function execution.
 
 See [RFC 911] for more details on the design of `const fn`s.