From e65aa302d34da29839fc72cf3363e85ccd71b2ee Mon Sep 17 00:00:00 2001
From: Florian Diebold <flodiebold@gmail.com>
Date: Sun, 6 May 2018 13:03:11 +0200
Subject: [PATCH] Turn the nonmodrs-mods test into a standard idempotence test

We need to skip children on foo.rs, since the parser will not find bar from that
file, but with that, the test works fine.
---
 src/test/mod.rs                                 | 17 -----------------
 tests/config/skip_children.toml                 |  1 +
 tests/issue-2673-nonmodrs-mods/foo.rs           |  3 ---
 tests/issue-2673-nonmodrs-mods/lib.rs           |  3 ---
 tests/target/issue-2673-nonmodrs-mods/foo.rs    |  4 ++++
 .../issue-2673-nonmodrs-mods/foo/bar.rs         |  0
 tests/target/issue-2673-nonmodrs-mods/lib.rs    |  6 ++++++
 7 files changed, 11 insertions(+), 23 deletions(-)
 create mode 100644 tests/config/skip_children.toml
 delete mode 100644 tests/issue-2673-nonmodrs-mods/foo.rs
 delete mode 100644 tests/issue-2673-nonmodrs-mods/lib.rs
 create mode 100644 tests/target/issue-2673-nonmodrs-mods/foo.rs
 rename tests/{ => target}/issue-2673-nonmodrs-mods/foo/bar.rs (100%)
 create mode 100644 tests/target/issue-2673-nonmodrs-mods/lib.rs

diff --git a/src/test/mod.rs b/src/test/mod.rs
index c58989508130..2680830f0656 100644
--- a/src/test/mod.rs
+++ b/src/test/mod.rs
@@ -232,23 +232,6 @@ fn self_tests() {
     );
 }
 
-#[test]
-fn issue_2673_non_modrs_mods() {
-    match idempotent_check(&PathBuf::from("tests/issue-2673-nonmodrs-mods/lib.rs")) {
-        Ok(ref report) if report.has_warnings() => {
-            print!("{}", report);
-            panic!("had warnings");
-        }
-        Ok(_report) => {}
-        Err(err) => {
-            if let IdempotentCheckError::Mismatch(msg) = err {
-                print_mismatches_default_message(msg);
-            }
-            panic!("had errors");
-        }
-    }
-}
-
 #[test]
 fn stdin_formatting_smoke_test() {
     let input = Input::Text("fn main () {}".to_owned());
diff --git a/tests/config/skip_children.toml b/tests/config/skip_children.toml
new file mode 100644
index 000000000000..49f37a88dfbe
--- /dev/null
+++ b/tests/config/skip_children.toml
@@ -0,0 +1 @@
+skip_children = true
\ No newline at end of file
diff --git a/tests/issue-2673-nonmodrs-mods/foo.rs b/tests/issue-2673-nonmodrs-mods/foo.rs
deleted file mode 100644
index c9fb22cf1a6b..000000000000
--- a/tests/issue-2673-nonmodrs-mods/foo.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod bar;
-
-mod baz {}
diff --git a/tests/issue-2673-nonmodrs-mods/lib.rs b/tests/issue-2673-nonmodrs-mods/lib.rs
deleted file mode 100644
index e2025a5449d8..000000000000
--- a/tests/issue-2673-nonmodrs-mods/lib.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![feature(non_modrs_mods)]
-
-mod foo;
diff --git a/tests/target/issue-2673-nonmodrs-mods/foo.rs b/tests/target/issue-2673-nonmodrs-mods/foo.rs
new file mode 100644
index 000000000000..5340816d61e0
--- /dev/null
+++ b/tests/target/issue-2673-nonmodrs-mods/foo.rs
@@ -0,0 +1,4 @@
+// rustfmt-config: skip_children.toml
+mod bar;
+
+mod baz {}
diff --git a/tests/issue-2673-nonmodrs-mods/foo/bar.rs b/tests/target/issue-2673-nonmodrs-mods/foo/bar.rs
similarity index 100%
rename from tests/issue-2673-nonmodrs-mods/foo/bar.rs
rename to tests/target/issue-2673-nonmodrs-mods/foo/bar.rs
diff --git a/tests/target/issue-2673-nonmodrs-mods/lib.rs b/tests/target/issue-2673-nonmodrs-mods/lib.rs
new file mode 100644
index 000000000000..82425de565a2
--- /dev/null
+++ b/tests/target/issue-2673-nonmodrs-mods/lib.rs
@@ -0,0 +1,6 @@
+#![feature(non_modrs_mods)]
+
+// Test that submodules in non-mod.rs files work. This is just an idempotence
+// test since we just want to verify that rustfmt doesn't fail.
+
+mod foo;