From 0883ce1b43ab2e3dd28c76e1c525c8db72cadef1 Mon Sep 17 00:00:00 2001 From: Alex Burka Date: Thu, 22 Jun 2017 19:10:56 +0000 Subject: [PATCH] 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 b20cd8908be1..8c11aa7def8a 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 b15bf44fbd06..50a6d174e222 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 1eda50877840..7c2eaecda670 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 } }