Rollup merge of #42833 - durka:non-constant-used-with-constant, r=Mark-Simulacrum

change span label for E0435

r? @Mark-Simulacrum

4 files changed, 4 insertions, 22 deletions

diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index b20cd8908be..8c11aa7def8 100644
--- 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 b15bf44fbd0..50a6d174e22 100644
--- 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-arr-len.rs
index 1eda5087784..17df7ae2347 100644
--- a/src/test/compile-fail/non-constant-expr-for-vec-repeat.rs
+++ b/src/test/compile-fail/non-constant-expr-for-arr-len.rs
@@ -8,12 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// Check that non constant exprs fail for vector repeat syntax
+// Check that non constant exprs fail for array repeat syntax
 
 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
     }
 }
diff --git a/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs b/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs
deleted file mode 100644
index 52cd4e8a3ed..00000000000
--- a/src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-// Check that non-constant exprs do fail as count in fixed length vec type
-
-fn main() {
-    fn bar(n: isize) {
-        let _x: [isize; n];
-        //~^ ERROR attempt to use a non-constant value in a constant [E0435]
-    }
-}