add support for formatting files in subdirectories of tests (#3777)

rust-lang · Oct 29, 2019 · d35ebf7 · d35ebf7 · calebcartwright · Oct 29, 2019
1 parent 09a028b
commit d35ebf7
Show file tree

Hide file tree

Showing 16 changed files with 416 additions and 45 deletions.
diff --git a/src/cargo-fmt/main.rs b/src/cargo-fmt/main.rs
diff --git a/tests/nested-test-files/empty-tests-dir/Cargo.toml b/tests/nested-test-files/empty-tests-dir/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "empty-tests-dir"
+version = "0.1.0"
+authors = ["rustfmt devs <awesome@gmail.com>"]
+
+[dependencies]
diff --git a/tests/nested-test-files/empty-tests-dir/src/lib.rs b/tests/nested-test-files/empty-tests-dir/src/lib.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/tests/nested-test-files/no-tests-dir/Cargo.toml b/tests/nested-test-files/no-tests-dir/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "no-tests"
+version = "0.1.0"
+authors = ["rustfmt devs <awesome@gmail.com>"]
+
+[dependencies]
diff --git a/tests/nested-test-files/no-tests-dir/src/lib.rs b/tests/nested-test-files/no-tests-dir/src/lib.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/tests/nested-test-files/only-root-level-tests-dir/Cargo.toml b/tests/nested-test-files/only-root-level-tests-dir/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "foo"
+version = "0.1.0"
+authors = ["rustfmt devs <awesome@gmail.com>"]
+
+[dependencies]
diff --git a/tests/nested-test-files/only-root-level-tests-dir/src/lib.rs b/tests/nested-test-files/only-root-level-tests-dir/src/lib.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/tests/nested-test-files/only-root-level-tests-dir/tests/bar.rs b/tests/nested-test-files/only-root-level-tests-dir/tests/bar.rs
@@ -0,0 +1,4 @@
+#[test]
+fn test2() {
+    assert!(true);
+}
diff --git a/tests/nested-test-files/only-root-level-tests-dir/tests/foo.rs b/tests/nested-test-files/only-root-level-tests-dir/tests/foo.rs
@@ -0,0 +1,4 @@
+#[test]
+fn test1() {
+    assert_eq!(1, 1);
+}
diff --git a/tests/nested-test-files/root-and-nested-tests/Cargo.toml b/tests/nested-test-files/root-and-nested-tests/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "root-and-nested-tests"
+version = "0.1.0"
+authors = ["rustfmt devs <awesome@gmail.com>"]
+edition = "2018"
+
+[dependencies]
diff --git a/tests/nested-test-files/root-and-nested-tests/src/lib.rs b/tests/nested-test-files/root-and-nested-tests/src/lib.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/tests/nested-test-files/root-and-nested-tests/tests/bar.rs b/tests/nested-test-files/root-and-nested-tests/tests/bar.rs
@@ -0,0 +1,4 @@
+#[test]
+fn test2() {
+    assert!(true);
+}
diff --git a/tests/nested-test-files/root-and-nested-tests/tests/foo.rs b/tests/nested-test-files/root-and-nested-tests/tests/foo.rs
@@ -0,0 +1,4 @@
+#[test]
+fn test1() {
+    assert_eq!(1, 1);
+}
diff --git a/tests/nested-test-files/root-and-nested-tests/tests/nested/deeply-nested/baz.rs b/tests/nested-test-files/root-and-nested-tests/tests/nested/deeply-nested/baz.rs
@@ -0,0 +1,4 @@
+#[test]
+fn test_truth() {
+    assert_eq!!(true, true);
+}
diff --git a/tests/nested-test-files/root-and-nested-tests/tests/nested/foo_bar.rs b/tests/nested-test-files/root-and-nested-tests/tests/nested/foo_bar.rs
@@ -0,0 +1,4 @@
+#[test]
+fn test_false() {
+    assert_ne!(false, true);
+}
diff --git a/tests/nested-test-files/root-and-nested-tests/tests/nested/other.rs b/tests/nested-test-files/root-and-nested-tests/tests/nested/other.rs
@@ -0,0 +1,4 @@
+#[test]
+fn test_add() {
+    assert_eq!(9, 4 + 5);
+}