commit b678238070cf43e97ab263788897eb64430ee4b4
author Oliver Scherer <github35764891676564198441@oli-obk.de> Tue Dec 18 09:16:56 2018 +0100
committer Oliver Scherer <github35764891676564198441@oli-obk.de> Tue Dec 18 09:16:56 2018 +0100
tree 4ec55cfabea220982744db23b66f8926aae05ee5
parent 6ca2ad584459b62e444e726af6ec958c31c77c1d

Properly worded diagnostic message

src/librustc_mir/transform/qualify_consts.rs

diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index 37d5e9d..10d14c1 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -1340,7 +1340,7 @@
                     let mut error = tcx.sess.struct_span_err(
                         span,
                         &format!(
-                            "new features like let bindings are not permitted in {} \
+                            "new features like let bindings are not permitted in {}s \
                             which also use short circuiting operators",
                             mode,
                         ),

src/test/ui/consts/const_short_circuit.stderr

diff --git a/src/test/ui/consts/const_short_circuit.stderr b/src/test/ui/consts/const_short_circuit.stderr
index 6f8fca6..8071344 100644
--- a/src/test/ui/consts/const_short_circuit.stderr
+++ b/src/test/ui/consts/const_short_circuit.stderr
@@ -1,4 +1,4 @@
-error: new features like let bindings are not permitted in constant which also use short circuiting operators
+error: new features like let bindings are not permitted in constants which also use short circuiting operators
   --> $DIR/const_short_circuit.rs:6:9
    |
 LL |     let mut x = true && false;
@@ -10,7 +10,7 @@
 LL |     let mut x = true && false;
    |                      ^^
 
-error: new features like let bindings are not permitted in constant which also use short circuiting operators
+error: new features like let bindings are not permitted in constants which also use short circuiting operators
   --> $DIR/const_short_circuit.rs:11:9
    |
 LL |     let x = true && false;