From c371563bfcbf08ff5674ccf1497daf6a214ec342 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sun, 24 Nov 2019 17:25:04 -0800
Subject: [PATCH] Reduce nesting of macrotest test cases

---
 test_suite/tests/expand/{derive/enum => }/de_enum.expanded.rs  | 0
 test_suite/tests/expand/{derive/enum => }/de_enum.rs           | 0
 .../expand/{derive/struct => }/default_ty_param.expanded.rs    | 0
 .../tests/expand/{derive/struct => }/default_ty_param.rs       | 0
 .../tests/expand/{derive/enum => }/generic_enum.expanded.rs    | 0
 test_suite/tests/expand/{derive/enum => }/generic_enum.rs      | 0
 .../expand/{derive/struct => }/generic_struct.expanded.rs      | 0
 test_suite/tests/expand/{derive/struct => }/generic_struct.rs  | 0
 .../{derive/struct => }/generic_tuple_struct.expanded.rs       | 0
 .../tests/expand/{derive/struct => }/generic_tuple_struct.rs   | 0
 .../tests/expand/{derive/enum => }/lifetimes.expanded.rs       | 0
 test_suite/tests/expand/{derive/enum => }/lifetimes.rs         | 0
 .../tests/expand/{derive/struct => }/named_map.expanded.rs     | 0
 test_suite/tests/expand/{derive/struct => }/named_map.rs       | 0
 .../tests/expand/{derive/struct => }/named_tuple.expanded.rs   | 0
 test_suite/tests/expand/{derive/struct => }/named_tuple.rs     | 0
 .../tests/expand/{derive/struct => }/named_unit.expanded.rs    | 0
 test_suite/tests/expand/{derive/struct => }/named_unit.rs      | 0
 test_suite/tests/expand/{derive/enum => }/ser_enum.expanded.rs | 0
 test_suite/tests/expand/{derive/enum => }/ser_enum.rs          | 0
 test_suite/tests/expand/{derive/enum => }/void.expanded.rs     | 0
 test_suite/tests/expand/{derive/enum => }/void.rs              | 0
 test_suite/tests/expandtest.rs                                 | 3 +--
 23 files changed, 1 insertion(+), 2 deletions(-)
 rename test_suite/tests/expand/{derive/enum => }/de_enum.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/de_enum.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/default_ty_param.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/default_ty_param.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/generic_enum.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/generic_enum.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/generic_struct.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/generic_struct.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/generic_tuple_struct.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/generic_tuple_struct.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/lifetimes.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/lifetimes.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/named_map.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/named_map.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/named_tuple.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/named_tuple.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/named_unit.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/struct => }/named_unit.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/ser_enum.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/ser_enum.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/void.expanded.rs (100%)
 rename test_suite/tests/expand/{derive/enum => }/void.rs (100%)

diff --git a/test_suite/tests/expand/derive/enum/de_enum.expanded.rs b/test_suite/tests/expand/de_enum.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/de_enum.expanded.rs
rename to test_suite/tests/expand/de_enum.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/de_enum.rs b/test_suite/tests/expand/de_enum.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/de_enum.rs
rename to test_suite/tests/expand/de_enum.rs
diff --git a/test_suite/tests/expand/derive/struct/default_ty_param.expanded.rs b/test_suite/tests/expand/default_ty_param.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/default_ty_param.expanded.rs
rename to test_suite/tests/expand/default_ty_param.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/default_ty_param.rs b/test_suite/tests/expand/default_ty_param.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/default_ty_param.rs
rename to test_suite/tests/expand/default_ty_param.rs
diff --git a/test_suite/tests/expand/derive/enum/generic_enum.expanded.rs b/test_suite/tests/expand/generic_enum.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/generic_enum.expanded.rs
rename to test_suite/tests/expand/generic_enum.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/generic_enum.rs b/test_suite/tests/expand/generic_enum.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/generic_enum.rs
rename to test_suite/tests/expand/generic_enum.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_struct.expanded.rs b/test_suite/tests/expand/generic_struct.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_struct.expanded.rs
rename to test_suite/tests/expand/generic_struct.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_struct.rs b/test_suite/tests/expand/generic_struct.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_struct.rs
rename to test_suite/tests/expand/generic_struct.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_tuple_struct.expanded.rs b/test_suite/tests/expand/generic_tuple_struct.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_tuple_struct.expanded.rs
rename to test_suite/tests/expand/generic_tuple_struct.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/generic_tuple_struct.rs b/test_suite/tests/expand/generic_tuple_struct.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/generic_tuple_struct.rs
rename to test_suite/tests/expand/generic_tuple_struct.rs
diff --git a/test_suite/tests/expand/derive/enum/lifetimes.expanded.rs b/test_suite/tests/expand/lifetimes.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/lifetimes.expanded.rs
rename to test_suite/tests/expand/lifetimes.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/lifetimes.rs b/test_suite/tests/expand/lifetimes.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/lifetimes.rs
rename to test_suite/tests/expand/lifetimes.rs
diff --git a/test_suite/tests/expand/derive/struct/named_map.expanded.rs b/test_suite/tests/expand/named_map.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_map.expanded.rs
rename to test_suite/tests/expand/named_map.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/named_map.rs b/test_suite/tests/expand/named_map.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_map.rs
rename to test_suite/tests/expand/named_map.rs
diff --git a/test_suite/tests/expand/derive/struct/named_tuple.expanded.rs b/test_suite/tests/expand/named_tuple.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_tuple.expanded.rs
rename to test_suite/tests/expand/named_tuple.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/named_tuple.rs b/test_suite/tests/expand/named_tuple.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_tuple.rs
rename to test_suite/tests/expand/named_tuple.rs
diff --git a/test_suite/tests/expand/derive/struct/named_unit.expanded.rs b/test_suite/tests/expand/named_unit.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_unit.expanded.rs
rename to test_suite/tests/expand/named_unit.expanded.rs
diff --git a/test_suite/tests/expand/derive/struct/named_unit.rs b/test_suite/tests/expand/named_unit.rs
similarity index 100%
rename from test_suite/tests/expand/derive/struct/named_unit.rs
rename to test_suite/tests/expand/named_unit.rs
diff --git a/test_suite/tests/expand/derive/enum/ser_enum.expanded.rs b/test_suite/tests/expand/ser_enum.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/ser_enum.expanded.rs
rename to test_suite/tests/expand/ser_enum.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/ser_enum.rs b/test_suite/tests/expand/ser_enum.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/ser_enum.rs
rename to test_suite/tests/expand/ser_enum.rs
diff --git a/test_suite/tests/expand/derive/enum/void.expanded.rs b/test_suite/tests/expand/void.expanded.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/void.expanded.rs
rename to test_suite/tests/expand/void.expanded.rs
diff --git a/test_suite/tests/expand/derive/enum/void.rs b/test_suite/tests/expand/void.rs
similarity index 100%
rename from test_suite/tests/expand/derive/enum/void.rs
rename to test_suite/tests/expand/void.rs
diff --git a/test_suite/tests/expandtest.rs b/test_suite/tests/expandtest.rs
index b51ab054..8e3a8639 100644
--- a/test_suite/tests/expandtest.rs
+++ b/test_suite/tests/expandtest.rs
@@ -3,6 +3,5 @@
 #[cfg_attr(not(cargo_expand), ignore)]
 #[test]
 fn expandtest() {
-    macrotest::expand("tests/expand/**/enum/*.rs");
-    macrotest::expand("tests/expand/**/struct/*.rs");
+    macrotest::expand("tests/expand/*.rs");
 }