Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 46 deletions

diff --git a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs b/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
deleted file mode 100644
index d4af6e864..000000000
--- a/src/test/ui/associated-consts/issue-69020-assoc-const-arith-overflow.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-// revisions: noopt opt opt_with_overflow_checks
-//[noopt]compile-flags: -C opt-level=0
-//[opt]compile-flags: -O
-//[opt_with_overflow_checks]compile-flags: -C overflow-checks=on -O
-
-#![crate_type="lib"]
-
-pub trait Foo {
-    const NEG: i32;
-    const NEG_REV: i32;
-
-    const ADD: i32;
-    const ADD_REV: i32;
-
-    const DIV: i32;
-    const DIV_REV: i32;
-
-    const OOB: i32;
-    const OOB_REV: i32;
-}
-
-// These constants cannot be evaluated already (they depend on `T::N`), so they can just be linted
-// like normal run-time code. But codegen works a bit different in const context, so this test
-// makes sure that we still catch overflow. Also make sure we emit the same lints if we reverse the
-// operands (so that the generic operand comes first).
-impl<T: Foo> Foo for Vec<T> {
-    const NEG: i32 = -i32::MIN + T::NEG;
-    //~^ ERROR arithmetic operation will overflow
-    const NEG_REV: i32 = T::NEG + (-i32::MIN);
-    //~^ ERROR arithmetic operation will overflow
-
-    const ADD: i32 = (i32::MAX+1) + T::ADD;
-    //~^ ERROR arithmetic operation will overflow
-    const ADD_REV: i32 =  T::ADD + (i32::MAX+1);
-    //~^ ERROR arithmetic operation will overflow
-
-    const DIV: i32 = (1/0) + T::DIV;
-    //~^ ERROR operation will panic
-    const DIV_REV: i32 = T::DIV + (1/0);
-    //~^ ERROR operation will panic
-
-    const OOB: i32 = [1][1] + T::OOB;
-    //~^ ERROR operation will panic
-    const OOB_REV: i32 = T::OOB + [1][1];
-    //~^ ERROR operation will panic
-}