From 0883ce1b43ab2e3dd28c76e1c525c8db72cadef1 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 22 Jun 2017 19:10:56 +0000 Subject: [PATCH 1/2] change span label for E0435 (fix #41871) --- src/librustc_resolve/lib.rs | 2 +- src/test/compile-fail/E0435.rs | 2 +- src/test/compile-fail/non-constant-expr-for-vec-repeat.rs | 2 +- 3 files changed, 3 insertions(+), 3 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-vec-repeat.rs index 1eda5087784..7c2eaecda67 100644 --- 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 } } From 369d4f18838027573e73b433b8cb25c96280fb0c Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 22 Jun 2017 19:13:09 +0000 Subject: [PATCH 2/2] remove duplicate E0435 test --- ...eat.rs => non-constant-expr-for-arr-len.rs} | 2 +- .../non-constant-expr-for-fixed-len-vec.rs | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) rename src/test/compile-fail/{non-constant-expr-for-vec-repeat.rs => non-constant-expr-for-arr-len.rs} (91%) delete mode 100644 src/test/compile-fail/non-constant-expr-for-fixed-len-vec.rs 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 similarity index 91% rename from src/test/compile-fail/non-constant-expr-for-vec-repeat.rs rename to src/test/compile-fail/non-constant-expr-for-arr-len.rs index 7c2eaecda67..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,7 +8,7 @@ // 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) { 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 or the MIT license -// , 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] - } -}