change span label for E0435 (fix #41871)

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index b20cd8908be18c4e05d9c2eaa62eeffb25b8dba4..8c11aa7def8a57b2d8d3be5b09fd1bb65cace163 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -325,7 +325,7 @@ fn resolve_struct_error<'sess, 'a>(resolver: &'sess Resolver,
                              span,
                              E0435,
                              "attempt to use a non-constant value in a constant");
-            err.span_label(span, "non-constant used with constant");
+            err.span_label(span, "non-constant value");
             err
         }
         ResolutionError::BindingShadowsSomethingUnacceptable(what_binding, name, binding) => {

diff --git a/src/test/compile-fail/E0435.rs b/src/test/compile-fail/E0435.rs
index b15bf44fbd063dcdbd0c5af28929d175a731cb6e..50a6d174e222a55ed6bc8afeeea7f1237cd56ff5 100644 (file)
--- a/src/test/compile-fail/E0435.rs
+++ b/src/test/compile-fail/E0435.rs
@@ -11,5 +11,5 @@
 fn main () {
     let foo = 42u32;
     let _: [u8; foo]; //~ ERROR E0435
-    //~| NOTE non-constant used with constant
+    //~| NOTE non-constant value
 }

diff --git a/src/test/compile-fail/non-constant-expr-for-vec-repeat.rs b/src/test/compile-fail/non-constant-expr-for-vec-repeat.rs
index 1eda5087784029be6f3aa30a76c95c035b6fa942..7c2eaecda670f25f3f3c640632677c15a3f2185f 100644 (file)
--- a/src/test/compile-fail/non-constant-expr-for-vec-repeat.rs
+++ b/src/test/compile-fail/non-constant-expr-for-vec-repeat.rs
@@ -14,6 +14,6 @@ fn main() {
     fn bar(n: usize) {
         let _x = [0; n];
         //~^ ERROR attempt to use a non-constant value in a constant [E0435]
-        //~| NOTE non-constant used with constant
+        //~| NOTE non-constant value
     }
 }