Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 25 deletions

diff --git a/src/test/ui/const-generics/parent_generics_of_encoding.rs b/src/test/ui/const-generics/parent_generics_of_encoding.rs
deleted file mode 100644
index b87e3960f..000000000
--- a/src/test/ui/const-generics/parent_generics_of_encoding.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// aux-build:generics_of_parent.rs
-// check-pass
-#![feature(generic_const_exprs)]
-#![allow(incomplete_features)]
-
-extern crate generics_of_parent;
-
-use generics_of_parent::{Foo, S};
-
-fn main() {
-    // regression test for #87603
-    const N: usize = 2;
-    let x: S<u8, N> = S::test();
-}
-
-// regression test for #87674
-fn new<U>(a: U) -> U {
-    a
-}
-fn foo<const N: usize>(bar: &mut Foo<N>)
-where
-    [(); N + 1]: ,
-{
-    *bar = new(loop {});
-}