diff options
| author | Alex Burka <alex@alexburka.com> | 2017-06-22 19:10:56 +0000 |
|---|---|---|
| committer | Alex Burka <alex@alexburka.com> | 2017-06-22 19:10:56 +0000 |
| commit | 0883ce1b43ab2e3dd28c76e1c525c8db72cadef1 (patch) | |
| tree | 094b428cd511a7ba746821ee9637ce79caa2a691 | |
| parent | ab5bec25530aac43dfd64384b405c909b6e405e3 (diff) | |
| download | rust-0883ce1b43ab2e3dd28c76e1c525c8db72cadef1.tar.gz rust-0883ce1b43ab2e3dd28c76e1c525c8db72cadef1.zip | |
change span label for E0435 (fix #41871)
| -rw-r--r-- | src/librustc_resolve/lib.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/E0435.rs | 2 | ||||
| -rw-r--r-- | 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 } } |