From 6647eeefb91a2f0e09f7df9f197917d22b01e846 Mon Sep 17 00:00:00 2001
From: varkor <github@varkor.com>
Date: Sat, 3 Oct 2020 18:48:56 +0100
Subject: Add `const_generics` test for `impl-trait-with-const-arguments`

---
 .../impl-trait-with-const-arguments.full.stderr    |  8 +++++++
 .../impl-trait-with-const-arguments.min.stderr     |  8 +++++++
 .../impl-trait-with-const-arguments.rs             | 26 ++++++++++++++++++++++
 .../impl-trait-with-const-arguments.rs             | 22 ------------------
 .../impl-trait-with-const-arguments.stderr         |  8 -------
 5 files changed, 42 insertions(+), 30 deletions(-)
 create mode 100644 src/test/ui/const-generics/impl-trait-with-const-arguments.full.stderr
 create mode 100644 src/test/ui/const-generics/impl-trait-with-const-arguments.min.stderr
 create mode 100644 src/test/ui/const-generics/impl-trait-with-const-arguments.rs
 delete mode 100644 src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.rs
 delete mode 100644 src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.stderr

diff --git a/src/test/ui/const-generics/impl-trait-with-const-arguments.full.stderr b/src/test/ui/const-generics/impl-trait-with-const-arguments.full.stderr
new file mode 100644
index 00000000000..a587cb61873
--- /dev/null
+++ b/src/test/ui/const-generics/impl-trait-with-const-arguments.full.stderr
@@ -0,0 +1,8 @@
+error[E0632]: cannot provide explicit generic arguments when `impl Trait` is used in argument position
+  --> $DIR/impl-trait-with-const-arguments.rs:24:20
+   |
+LL |     assert_eq!(f::<4usize>(Usizable), 20usize);
+   |                    ^^^^^^ explicit generic argument not allowed
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/const-generics/impl-trait-with-const-arguments.min.stderr b/src/test/ui/const-generics/impl-trait-with-const-arguments.min.stderr
new file mode 100644
index 00000000000..a587cb61873
--- /dev/null
+++ b/src/test/ui/const-generics/impl-trait-with-const-arguments.min.stderr
@@ -0,0 +1,8 @@
+error[E0632]: cannot provide explicit generic arguments when `impl Trait` is used in argument position
+  --> $DIR/impl-trait-with-const-arguments.rs:24:20
+   |
+LL |     assert_eq!(f::<4usize>(Usizable), 20usize);
+   |                    ^^^^^^ explicit generic argument not allowed
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/const-generics/impl-trait-with-const-arguments.rs b/src/test/ui/const-generics/impl-trait-with-const-arguments.rs
new file mode 100644
index 00000000000..a4c75792ee3
--- /dev/null
+++ b/src/test/ui/const-generics/impl-trait-with-const-arguments.rs
@@ -0,0 +1,26 @@
+// revisions: full min
+
+#![cfg_attr(full, allow(incomplete_features))]
+#![cfg_attr(full, feature(const_generics))]
+#![cfg_attr(min, feature(min_const_generics))]
+
+trait Usizer {
+    fn m(self) -> usize;
+}
+
+fn f<const N: usize>(u: impl Usizer) -> usize {
+    N + u.m()
+}
+
+struct Usizable;
+
+impl Usizer for Usizable {
+    fn m(self) -> usize {
+        16
+    }
+}
+
+fn main() {
+    assert_eq!(f::<4usize>(Usizable), 20usize);
+//~^ ERROR cannot provide explicit generic arguments when `impl Trait` is used in argument position
+}
diff --git a/src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.rs b/src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.rs
deleted file mode 100644
index 97ae3b838a3..00000000000
--- a/src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-#![feature(min_const_generics)]
-
-trait Usizer {
-    fn m(self) -> usize;
-}
-
-fn f<const N: usize>(u: impl Usizer) -> usize {
-    N + u.m()
-}
-
-struct Usizable;
-
-impl Usizer for Usizable {
-    fn m(self) -> usize {
-        16
-    }
-}
-
-fn main() {
-    assert_eq!(f::<4usize>(Usizable), 20usize);
-//~^ ERROR cannot provide explicit generic arguments when `impl Trait` is used in argument position
-}
diff --git a/src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.stderr b/src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.stderr
deleted file mode 100644
index 0a6d3509863..00000000000
--- a/src/test/ui/const-generics/min_const_generics/impl-trait-with-const-arguments.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-error[E0632]: cannot provide explicit generic arguments when `impl Trait` is used in argument position
-  --> $DIR/impl-trait-with-const-arguments.rs:20:20
-   |
-LL |     assert_eq!(f::<4usize>(Usizable), 20usize);
-   |                    ^^^^^^ explicit generic argument not allowed
-
-error: aborting due to previous error
-
-- 
cgit 1.4.1-3-g733a5