Properly worded diagnostic message

diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index 37d5e9dca36955b82e7bab862ac7f7b8ac34ec2b..10d14c1e412a295657b5b08f621295d46c56767e 100644 (file)
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -1340,7 +1340,7 @@ fn run_pass<'a, 'tcx>(&self,
                     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,
                         ),

diff --git a/src/test/ui/consts/const_short_circuit.stderr b/src/test/ui/consts/const_short_circuit.stderr
index 6f8fca60c8098ca2ca6d286c59ddb83f69db5826..807134427061f4313326abd3336c4aa98b8493f4 100644 (file)
--- 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 @@ note: use of `&&` operator here
 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;