---

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

Author: Nick Hamann

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7e78e708fb3f5115b47cc1c0b32c77a381519ecc
+refs/heads/master: 364035497c2bf882cd46a33e0cd6bf4e64370ea4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
 refs/heads/try: 7b4ef47b7805a402d756fb8157101f64880a522f

trunk/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.