Overhaul 100222 test; wf always remap to nonconst

1 files changed, 17 insertions, 4 deletions

diff --git a/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs b/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs
index 40517ecdd6c..2db5595a5ae 100644
--- a/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs
+++ b/src/test/ui/rfc-2632-const-trait-impl/issue-100222.rs
@@ -1,14 +1,27 @@
+// revisions: nn ny yn yy
 // check-pass
-#![feature(const_trait_impl)]
+#![feature(const_trait_impl, associated_type_defaults, const_mut_refs)]
 
-#[const_trait]
+#[cfg_attr(any(yn, yy), const_trait)]
 pub trait Index {
     type Output;
 }
 
-#[const_trait]
+#[cfg_attr(any(ny, yy), const_trait)]
 pub trait IndexMut where Self: Index {
-    fn foo(&mut self) -> <Self as Index>::Output;
+    const C: <Self as Index>::Output;
+    type Assoc = <Self as Index>::Output;
+    fn foo(&mut self, x: <Self as Index>::Output) -> <Self as Index>::Output;
 }
 
+impl Index for () { type Output = (); }
+
+impl const IndexMut for <() as Index>::Output {
+    const C: <Self as Index>::Output = ();
+    type Assoc = <Self as Index>::Output;
+    fn foo(&mut self, x: <Self as Index>::Output) -> <Self as Index>::Output where <Self as Index>::Output: {}
+}
+
+const C: <() as Index>::Output = ();
+
 fn main() {}