Tidy up and pass tests

[rust.git] / tests / target / trait.rs

diff --git a/tests/target/trait.rs b/tests/target/trait.rs
index e4758e98b5e9876cad48769816be8dd32090d1a5..133e8babedb9759c5bdaf851eb0653d4d62e1e15 100644 (file)
--- a/tests/target/trait.rs
+++ b/tests/target/trait.rs
@@ -43,6 +43,7 @@ trait T {}
 
 trait Foo {
     type Bar: Baz;
+    type Inner: Foo = Box<Foo>;
 }
 
 trait ConstCheck<T>: Foo
@@ -54,13 +55,13 @@ trait ConstCheck<T>: Foo
 
 trait Tttttttttttttttttttttttttttttttttttttttttttttttttttttttttt<T>
 where
-    T: Foo
+    T: Foo,
 {
 }
 
 trait Ttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt<T>
 where
-    T: Foo
+    T: Foo,
 {
 }
 
@@ -75,6 +76,57 @@ trait FooBar<T>
 trait WhereList<T, J>
 where
     T: Foo,
-    J: Bar
+    J: Bar,
 {
 }
+
+trait X /* comment */ {}
+trait Y // comment
+{
+}
+
+// #2055
+pub trait Foo:
+// A and C
+A + C
+// and B
+    + B
+{}
+
+// #2158
+trait Foo {
+    type ItRev = <MergingUntypedTimeSeries<SliceSeries<SliceWindow>> as UntypedTimeSeries>::IterRev;
+    type IteRev =
+        <MergingUntypedTimeSeries<SliceSeries<SliceWindow>> as UntypedTimeSeries>::IterRev;
+}
+
+// #2331
+trait MyTrait<
+    AAAAAAAAAAAAAAAAAAAA,
+    BBBBBBBBBBBBBBBBBBBB,
+    CCCCCCCCCCCCCCCCCCCC,
+    DDDDDDDDDDDDDDDDDDDD,
+> {
+    fn foo() {}
+}
+
+// Trait aliases
+trait FooBar = Foo + Bar;
+trait FooBar<A, B, C> = Foo + Bar;
+trait AAAAAAAAAAAAAAAAAA = BBBBBBBBBBBBBBBBBBB + CCCCCCCCCCCCCCCCCCCCCCCCCCCCC + DDDDDDDDDDDDDDDDDD;
+trait AAAAAAAAAAAAAAAAAAA =
+    BBBBBBBBBBBBBBBBBBB + CCCCCCCCCCCCCCCCCCCCCCCCCCCCC + DDDDDDDDDDDDDDDDDD;
+trait AAAAAAAAAAAAAAAAAA =
+    BBBBBBBBBBBBBBBBBBB + CCCCCCCCCCCCCCCCCCCCCCCCCCCCC + DDDDDDDDDDDDDDDDDDD;
+trait AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA<A, B, C, D, E> =
+    FooBar;
+trait AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA<
+    A,
+    B,
+    C,
+    D,
+    E,
+> = FooBar;
+#[rustfmt_skip]
+trait FooBar = Foo
+    + Bar;