Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/ui/const-generics/defaults/complex-generic-default-expr.rs b/tests/ui/const-generics/defaults/complex-generic-default-expr.rs
new file mode 100644
index 000000000..7f50d4c9f
--- /dev/null
+++ b/tests/ui/const-generics/defaults/complex-generic-default-expr.rs
@@ -0,0 +1,12 @@
+// revisions: full min
+//[full] check-pass
+#![cfg_attr(full, feature(generic_const_exprs))]
+#![cfg_attr(full, allow(incomplete_features))]
+
+struct Foo<const N: usize, const M: usize = { N + 1 }>;
+//[min]~^ ERROR generic parameters may not be used in const operations
+
+struct Bar<T, const TYPE_SIZE: usize = { std::mem::size_of::<T>() }>(T);
+//[min]~^ ERROR generic parameters may not be used in const operations
+
+fn main() {}