From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:02:58 +0200
Subject: Adding upstream version 1.64.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/tools/rustfmt/tests/source/issue-3253/bar.rs           |  4 ++++
 src/tools/rustfmt/tests/source/issue-3253/foo.rs           |  6 ++++++
 src/tools/rustfmt/tests/source/issue-3253/lib.rs           | 14 ++++++++++++++
 src/tools/rustfmt/tests/source/issue-3253/paths/bar_foo.rs |  3 +++
 .../rustfmt/tests/source/issue-3253/paths/excluded.rs      |  6 ++++++
 src/tools/rustfmt/tests/source/issue-3253/paths/foo_bar.rs |  4 ++++
 6 files changed, 37 insertions(+)
 create mode 100644 src/tools/rustfmt/tests/source/issue-3253/bar.rs
 create mode 100644 src/tools/rustfmt/tests/source/issue-3253/foo.rs
 create mode 100644 src/tools/rustfmt/tests/source/issue-3253/lib.rs
 create mode 100644 src/tools/rustfmt/tests/source/issue-3253/paths/bar_foo.rs
 create mode 100644 src/tools/rustfmt/tests/source/issue-3253/paths/excluded.rs
 create mode 100644 src/tools/rustfmt/tests/source/issue-3253/paths/foo_bar.rs

(limited to 'src/tools/rustfmt/tests/source/issue-3253')

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 000000000..eaeffd3ad
--- /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 000000000..4ebe5326b
--- /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 000000000..3eef586bd
--- /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 000000000..da19f9dfa
--- /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 000000000..5c63eb832
--- /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 000000000..fbb5d92c6
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/issue-3253/paths/foo_bar.rs
@@ -0,0 +1,4 @@
+
+
+fn Foo<T>() where T: Bar {
+}
-- 
cgit v1.2.3