about summary refs log tree commit diff
path: root/src/tools/rustfmt/tests/source/issue-3253
diff options
context:
space:
mode:
authorCaleb Cartwright <caleb.cartwright@outlook.com>2021-05-14 21:53:36 -0500
committerCaleb Cartwright <caleb.cartwright@outlook.com>2021-05-14 21:53:36 -0500
commitb2d45c0d4b2d44789000ebec6d702cc27db19782 (patch)
treec3accc00616767e5de0f89f69ce87519f02de6d5 /src/tools/rustfmt/tests/source/issue-3253
parente659b6de9170c055b6f2d16e2679b22d67297b13 (diff)
parent7872306edf2e11a69aaffb9434088fd66b46a863 (diff)
downloadrust-b2d45c0d4b2d44789000ebec6d702cc27db19782.tar.gz
rust-b2d45c0d4b2d44789000ebec6d702cc27db19782.zip
Add 'src/tools/rustfmt/' from commit '7872306edf2e11a69aaffb9434088fd66b46a863'
git-subtree-dir: src/tools/rustfmt
git-subtree-mainline: e659b6de9170c055b6f2d16e2679b22d67297b13
git-subtree-split: 7872306edf2e11a69aaffb9434088fd66b46a863
Diffstat (limited to 'src/tools/rustfmt/tests/source/issue-3253')
-rw-r--r--src/tools/rustfmt/tests/source/issue-3253/bar.rs4
-rw-r--r--src/tools/rustfmt/tests/source/issue-3253/foo.rs6
-rw-r--r--src/tools/rustfmt/tests/source/issue-3253/lib.rs14
-rw-r--r--src/tools/rustfmt/tests/source/issue-3253/paths/bar_foo.rs3
-rw-r--r--src/tools/rustfmt/tests/source/issue-3253/paths/excluded.rs6
-rw-r--r--src/tools/rustfmt/tests/source/issue-3253/paths/foo_bar.rs4
6 files changed, 37 insertions, 0 deletions
diff --git a/src/tools/rustfmt/tests/source/issue-3253/bar.rs b/src/tools/rustfmt/tests/source/issue-3253/bar.rs
new file mode 100644
index 00000000000..eaeffd3ad00
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/issue-3253/bar.rs
@@ -0,0 +1,4 @@
+// Empty
+   fn empty()     {
+
+}
diff --git a/src/tools/rustfmt/tests/source/issue-3253/foo.rs b/src/tools/rustfmt/tests/source/issue-3253/foo.rs
new file mode 100644
index 00000000000..4ebe5326b3c
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/issue-3253/foo.rs
@@ -0,0 +1,6 @@
+pub    fn hello(  )
+    {
+println!("Hello World!");
+
+            }
+
diff --git a/src/tools/rustfmt/tests/source/issue-3253/lib.rs b/src/tools/rustfmt/tests/source/issue-3253/lib.rs
new file mode 100644
index 00000000000..3eef586bd67
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/issue-3253/lib.rs
@@ -0,0 +1,14 @@
+#[macro_use]
+extern crate cfg_if;
+
+cfg_if! {
+    if #[cfg(target_family = "unix")] {
+        mod foo;
+        #[path = "paths/bar_foo.rs"]
+        mod bar_foo;
+    } else {
+        mod bar;
+        #[path = "paths/foo_bar.rs"]
+        mod foo_bar;
+    }
+}
diff --git a/src/tools/rustfmt/tests/source/issue-3253/paths/bar_foo.rs b/src/tools/rustfmt/tests/source/issue-3253/paths/bar_foo.rs
new file mode 100644
index 00000000000..da19f9dfaa1
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/issue-3253/paths/bar_foo.rs
@@ -0,0 +1,3 @@
+fn    foo_decl_item(x: &mut i32) {
+    x = 3;
+}
diff --git a/src/tools/rustfmt/tests/source/issue-3253/paths/excluded.rs b/src/tools/rustfmt/tests/source/issue-3253/paths/excluded.rs
new file mode 100644
index 00000000000..5c63eb83203
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/issue-3253/paths/excluded.rs
@@ -0,0 +1,6 @@
+// This module is not imported in the cfg_if macro in lib.rs so it is ignored
+// while the foo and bar mods are formatted.
+// Check the corresponding file in tests/target/issue-3253/paths/excluded.rs
+trait CoolerTypes { fn dummy(&self) {
+}
+}
diff --git a/src/tools/rustfmt/tests/source/issue-3253/paths/foo_bar.rs b/src/tools/rustfmt/tests/source/issue-3253/paths/foo_bar.rs
new file mode 100644
index 00000000000..fbb5d92c6e3
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/issue-3253/paths/foo_bar.rs
@@ -0,0 +1,4 @@
+
+
+fn Foo<T>() where T: Bar {
+}