Accept duplicate on const_errs (for now).

rust-lang · Mar 29, 2020 · 6d33a18 · 6d33a18
1 parent d95a610
commit 6d33a18
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 21 deletions.
diff --git a/src/test/ui/associated-const/lints-used-unused.rs b/src/test/ui/associated-const/lints-used-unused.rs
@@ -15,10 +15,12 @@ struct S;
 impl Foo for S {
     const N: i32 = 1 << 42;
     //~^ ERROR this arithmetic operation will overflow
+    //~| ERROR any use of this value will cause an error
 }
 
 impl<T: Foo> Foo for Vec<T> {
-    const N: i32 = --T::N + (-i32::MIN); //~ ERROR this arithmetic operation will overflow
+    const N: i32 = --T::N + (-i32::MIN);
+    //~^ ERROR this arithmetic operation will overflow
 }
 
 fn main() {

diff --git a/src/test/ui/associated-const/lints-used-unused.unused.stderr b/src/test/ui/associated-const/lints-used-unused.unused.stderr
@@ -20,5 +20,11 @@ LL |     const N: i32 = 1 << 42;
    |
    = note: `#[deny(const_err)]` on by default
 
-error: aborting due to 2 previous errors
+error: this arithmetic operation will overflow
+  --> $DIR/lints-used-unused.rs:22:29
+   |
+LL |     const N: i32 = --T::N + (-i32::MIN);
+   |                             ^^^^^^^^^^^ attempt to negate with overflow
+
+error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/associated-const/lints-used-unused.used.stderr b/src/test/ui/associated-const/lints-used-unused.used.stderr
@@ -20,5 +20,11 @@ LL |     const N: i32 = 1 << 42;
    |
    = note: `#[deny(const_err)]` on by default
 
-error: aborting due to 2 previous errors
+error: this arithmetic operation will overflow
+  --> $DIR/lints-used-unused.rs:22:29
+   |
+LL |     const N: i32 = --T::N + (-i32::MIN);
+   |                             ^^^^^^^^^^^ attempt to negate with overflow
+
+error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/consts/issue-69020.noopt.stderr b/src/test/ui/consts/issue-69020.noopt.stderr
@@ -17,43 +17,43 @@ LL |     const NEG: i32 = -i32::MIN + T::NEG;
    = note: `#[deny(const_err)]` on by default
 
 error: this arithmetic operation will overflow
-  --> $DIR/issue-69020.rs:23:22
+  --> $DIR/issue-69020.rs:24:22
    |
 LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
    |                      ^^^^^^^^^^^^ attempt to add with overflow
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:23:22
+  --> $DIR/issue-69020.rs:24:22
    |
 LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
    |     -----------------^^^^^^^^^^^^----------
    |                      |
    |                      attempt to add with overflow
 
 error: this operation will panic at runtime
-  --> $DIR/issue-69020.rs:25:22
+  --> $DIR/issue-69020.rs:27:22
    |
 LL |     const DIV: i32 = (1/0) + T::DIV;
    |                      ^^^^^ attempt to divide by zero
    |
    = note: `#[deny(unconditional_panic)]` on by default
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:25:22
+  --> $DIR/issue-69020.rs:27:22
    |
 LL |     const DIV: i32 = (1/0) + T::DIV;
    |     -----------------^^^^^----------
    |                      |
    |                      attempt to divide by zero
 
 error: this operation will panic at runtime
-  --> $DIR/issue-69020.rs:27:22
+  --> $DIR/issue-69020.rs:30:22
    |
 LL |     const OOB: i32 = [1][1] + T::OOB;
    |                      ^^^^^^ index out of bounds: the len is 1 but the index is 1
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:27:22
+  --> $DIR/issue-69020.rs:30:22
    |
 LL |     const OOB: i32 = [1][1] + T::OOB;
    |     -----------------^^^^^^----------

diff --git a/src/test/ui/consts/issue-69020.opt.stderr b/src/test/ui/consts/issue-69020.opt.stderr
@@ -17,43 +17,43 @@ LL |     const NEG: i32 = -i32::MIN + T::NEG;
    = note: `#[deny(const_err)]` on by default
 
 error: this arithmetic operation will overflow
-  --> $DIR/issue-69020.rs:23:22
+  --> $DIR/issue-69020.rs:24:22
    |
 LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
    |                      ^^^^^^^^^^^^ attempt to add with overflow
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:23:22
+  --> $DIR/issue-69020.rs:24:22
    |
 LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
    |     -----------------^^^^^^^^^^^^----------
    |                      |
    |                      attempt to add with overflow
 
 error: this operation will panic at runtime
-  --> $DIR/issue-69020.rs:25:22
+  --> $DIR/issue-69020.rs:27:22
    |
 LL |     const DIV: i32 = (1/0) + T::DIV;
    |                      ^^^^^ attempt to divide by zero
    |
    = note: `#[deny(unconditional_panic)]` on by default
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:25:22
+  --> $DIR/issue-69020.rs:27:22
    |
 LL |     const DIV: i32 = (1/0) + T::DIV;
    |     -----------------^^^^^----------
    |                      |
    |                      attempt to divide by zero
 
 error: this operation will panic at runtime
-  --> $DIR/issue-69020.rs:27:22
+  --> $DIR/issue-69020.rs:30:22
    |
 LL |     const OOB: i32 = [1][1] + T::OOB;
    |                      ^^^^^^ index out of bounds: the len is 1 but the index is 1
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:27:22
+  --> $DIR/issue-69020.rs:30:22
    |
 LL |     const OOB: i32 = [1][1] + T::OOB;
    |     -----------------^^^^^^----------

diff --git a/src/test/ui/consts/issue-69020.opt_with_overflow_checks.stderr b/src/test/ui/consts/issue-69020.opt_with_overflow_checks.stderr
@@ -17,43 +17,43 @@ LL |     const NEG: i32 = -i32::MIN + T::NEG;
    = note: `#[deny(const_err)]` on by default
 
 error: this arithmetic operation will overflow
-  --> $DIR/issue-69020.rs:23:22
+  --> $DIR/issue-69020.rs:24:22
    |
 LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
    |                      ^^^^^^^^^^^^ attempt to add with overflow
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:23:22
+  --> $DIR/issue-69020.rs:24:22
    |
 LL |     const ADD: i32 = (i32::MAX+1) + T::ADD;
    |     -----------------^^^^^^^^^^^^----------
    |                      |
    |                      attempt to add with overflow
 
 error: this operation will panic at runtime
-  --> $DIR/issue-69020.rs:25:22
+  --> $DIR/issue-69020.rs:27:22
    |
 LL |     const DIV: i32 = (1/0) + T::DIV;
    |                      ^^^^^ attempt to divide by zero
    |
    = note: `#[deny(unconditional_panic)]` on by default
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:25:22
+  --> $DIR/issue-69020.rs:27:22
    |
 LL |     const DIV: i32 = (1/0) + T::DIV;
    |     -----------------^^^^^----------
    |                      |
    |                      attempt to divide by zero
 
 error: this operation will panic at runtime
-  --> $DIR/issue-69020.rs:27:22
+  --> $DIR/issue-69020.rs:30:22
    |
 LL |     const OOB: i32 = [1][1] + T::OOB;
    |                      ^^^^^^ index out of bounds: the len is 1 but the index is 1
 
 error: any use of this value will cause an error
-  --> $DIR/issue-69020.rs:27:22
+  --> $DIR/issue-69020.rs:30:22
    |
 LL |     const OOB: i32 = [1][1] + T::OOB;
    |     -----------------^^^^^^----------

diff --git a/src/test/ui/consts/issue-69020.rs b/src/test/ui/consts/issue-69020.rs
@@ -20,10 +20,14 @@ pub trait Foo {
 impl<T: Foo> Foo for Vec<T> {
     const NEG: i32 = -i32::MIN + T::NEG;
     //~^ ERROR arithmetic operation will overflow
+    //~| ERROR any use of this value will cause an error
     const ADD: i32 = (i32::MAX+1) + T::ADD;
     //~^ ERROR arithmetic operation will overflow
+    //~| ERROR any use of this value will cause an error
     const DIV: i32 = (1/0) + T::DIV;
     //~^ ERROR operation will panic
+    //~| ERROR any use of this value will cause an error
     const OOB: i32 = [1][1] + T::OOB;
     //~^ ERROR operation will panic
+    //~| ERROR any use of this value will cause an error
 }