Move type punctuation tests under config dir

diff --git a/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs b/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs
index 6e16e61056691ab0fd7636b8a5de955e3efa1594..223b9a2f0f0221101f483a90db2bbe839883d48e 100644 (file)
--- a/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs
+++ b/rustfmt-core/tests/source/configs/type_punctuation_density/compressed.rs
@@ -4,3 +4,34 @@
 fn lorem<Ipsum:Dolor+Sit=Amet>() {
     // body
 }
+
+struct Foo<T: Eq + Clone, U>
+where U: Eq + Clone {
+    // body
+}
+
+trait Foo<'a, T = usize>
+where T: 'a + Eq + Clone
+{
+    type Bar: Eq + Clone;
+}
+
+trait Foo: Eq + Clone {
+    // body
+}
+
+impl<T> Foo<'a> for Bar
+where for<'a> T: 'a + Eq + Clone
+{
+    // body
+}
+
+fn foo<'a, 'b, 'c>()
+where 'a: 'b + 'c
+{
+    // body
+}
+
+fn Foo<T = Foo, Output = Expr<'tcx> + Foo>() {
+    let i = 6;
+}

diff --git a/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs b/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs
index 1fcdddf0f9aaf49770e761d5880d09d0eedd2b05..fe0c0816701b5c299027466ab0cc12fc8c15cc35 100644 (file)
--- a/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs
+++ b/rustfmt-core/tests/source/configs/type_punctuation_density/wide.rs
@@ -4,3 +4,34 @@
 fn lorem<Ipsum:Dolor+Sit=Amet>() {
     // body
 }
+
+struct Foo<T: Eq + Clone, U>
+where U: Eq + Clone {
+    // body
+}
+
+trait Foo<'a, T = usize>
+where T: 'a + Eq + Clone
+{
+    type Bar: Eq + Clone;
+}
+
+trait Foo: Eq + Clone {
+    // body
+}
+
+impl<T> Foo<'a> for Bar
+where for<'a> T: 'a + Eq + Clone
+{
+    // body
+}
+
+fn foo<'a, 'b, 'c>()
+where 'a: 'b + 'c
+{
+    // body
+}
+
+fn Foo<T = Foo, Output = Expr<'tcx> + Foo>() {
+    let i = 6;
+}

diff --git a/rustfmt-core/tests/source/type-punctuation.rs b/rustfmt-core/tests/source/type-punctuation.rs
deleted file mode 100644 (file)
index 0980e4a..0000000
--- a/rustfmt-core/tests/source/type-punctuation.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// rustfmt-type_punctuation_density: Compressed
-
-struct Foo<T: Eq + Clone, U>
-    where U: Eq + Clone {
-    // body
-}
-
-trait Foo<'a, T = usize>
-    where T: 'a + Eq + Clone
-{
-    type Bar: Eq + Clone;
-}
-
-trait Foo: Eq + Clone {
-    // body
-}
-
-impl<T> Foo<'a> for Bar
-    where for<'a> T: 'a + Eq + Clone
-{
-    // body
-}
-
-fn foo<'a, 'b, 'c>()
-    where 'a: 'b + 'c
-{
-    // body
-}
-
-fn Foo<T = Foo, Output = Expr<'tcx> + Foo>() {
-    let i = 6;
-}

diff --git a/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs b/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs
index 4b3e02e19ea1bfa9ef289520538ba06a34676e3c..6571e448e446a8d2667153fd8a7e46eaa21a9d85 100644 (file)
--- a/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs
+++ b/rustfmt-core/tests/target/configs/type_punctuation_density/compressed.rs
@@ -4,3 +4,38 @@
 fn lorem<Ipsum: Dolor+Sit=Amet>() {
     // body
 }
+
+struct Foo<T: Eq+Clone, U>
+where
+    U: Eq+Clone, {
+    // body
+}
+
+trait Foo<'a, T=usize>
+where
+    T: 'a+Eq+Clone,
+{
+    type Bar: Eq+Clone;
+}
+
+trait Foo: Eq+Clone {
+    // body
+}
+
+impl<T> Foo<'a> for Bar
+where
+    for<'a> T: 'a+Eq+Clone,
+{
+    // body
+}
+
+fn foo<'a, 'b, 'c>()
+where
+    'a: 'b+'c,
+{
+    // body
+}
+
+fn Foo<T=Foo, Output=Expr<'tcx>+Foo>() {
+    let i = 6;
+}

diff --git a/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs b/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs
index 8909036e688fcd393ba62fdc9edc2fa96846d1b8..01546c7b0a517307f9afd9cb28c7d27f2725110b 100644 (file)
--- a/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs
+++ b/rustfmt-core/tests/target/configs/type_punctuation_density/wide.rs
@@ -4,3 +4,38 @@
 fn lorem<Ipsum: Dolor + Sit = Amet>() {
     // body
 }
+
+struct Foo<T: Eq + Clone, U>
+where
+    U: Eq + Clone, {
+    // body
+}
+
+trait Foo<'a, T = usize>
+where
+    T: 'a + Eq + Clone,
+{
+    type Bar: Eq + Clone;
+}
+
+trait Foo: Eq + Clone {
+    // body
+}
+
+impl<T> Foo<'a> for Bar
+where
+    for<'a> T: 'a + Eq + Clone,
+{
+    // body
+}
+
+fn foo<'a, 'b, 'c>()
+where
+    'a: 'b + 'c,
+{
+    // body
+}
+
+fn Foo<T = Foo, Output = Expr<'tcx> + Foo>() {
+    let i = 6;
+}

diff --git a/rustfmt-core/tests/target/type-punctuation.rs b/rustfmt-core/tests/target/type-punctuation.rs
deleted file mode 100644 (file)
index f35293d..0000000
--- a/rustfmt-core/tests/target/type-punctuation.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-// rustfmt-type_punctuation_density: Compressed
-
-struct Foo<T: Eq+Clone, U>
-where
-    U: Eq+Clone, {
-    // body
-}
-
-trait Foo<'a, T=usize>
-where
-    T: 'a+Eq+Clone,
-{
-    type Bar: Eq+Clone;
-}
-
-trait Foo: Eq+Clone {
-    // body
-}
-
-impl<T> Foo<'a> for Bar
-where
-    for<'a> T: 'a+Eq+Clone,
-{
-    // body
-}
-
-fn foo<'a, 'b, 'c>()
-where
-    'a: 'b+'c,
-{
-    // body
-}
-
-fn Foo<T=Foo, Output=Expr<'tcx>+Foo>() {
-    let i = 6;
-}