Merge pull request #1889 from rust-lang/rustc-pull

Rustc pull update

1 files changed, 16 insertions, 0 deletions

diff --git a/tests/ui/const-generics/generic-parameter-in-const-expression-39211.rs b/tests/ui/const-generics/generic-parameter-in-const-expression-39211.rs
new file mode 100644
index 00000000000..b2566e54471
--- /dev/null
+++ b/tests/ui/const-generics/generic-parameter-in-const-expression-39211.rs
@@ -0,0 +1,16 @@
+trait VecN {
+    const DIM: usize;
+}
+trait Mat {
+    type Row: VecN;
+}
+
+fn m<M: Mat>() {
+    let a = [3; M::Row::DIM];
+    //~^ ERROR constant expression depends on a generic parameter
+    //~| ERROR constant expression depends on a generic parameter
+}
+fn main() {
+}
+
+// https://github.com/rust-lang/rust/issues/39211