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/nestedmod/mod.rs          | 13 +++++++++++++
 src/tools/rustfmt/tests/source/nestedmod/mod2a.rs        |  4 ++++
 src/tools/rustfmt/tests/source/nestedmod/mod2b.rs        |  3 +++
 src/tools/rustfmt/tests/source/nestedmod/mod2c.rs        |  3 +++
 src/tools/rustfmt/tests/source/nestedmod/mymod1/mod3a.rs |  2 ++
 src/tools/rustfmt/tests/source/nestedmod/submod2/a.rs    |  6 ++++++
 src/tools/rustfmt/tests/source/nestedmod/submod2/mod.rs  |  5 +++++
 7 files changed, 36 insertions(+)
 create mode 100644 src/tools/rustfmt/tests/source/nestedmod/mod.rs
 create mode 100644 src/tools/rustfmt/tests/source/nestedmod/mod2a.rs
 create mode 100644 src/tools/rustfmt/tests/source/nestedmod/mod2b.rs
 create mode 100644 src/tools/rustfmt/tests/source/nestedmod/mod2c.rs
 create mode 100644 src/tools/rustfmt/tests/source/nestedmod/mymod1/mod3a.rs
 create mode 100644 src/tools/rustfmt/tests/source/nestedmod/submod2/a.rs
 create mode 100644 src/tools/rustfmt/tests/source/nestedmod/submod2/mod.rs

(limited to 'src/tools/rustfmt/tests/source/nestedmod')

diff --git a/src/tools/rustfmt/tests/source/nestedmod/mod.rs b/src/tools/rustfmt/tests/source/nestedmod/mod.rs
new file mode 100644
index 000000000..d04e49570
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/nestedmod/mod.rs
@@ -0,0 +1,13 @@
+
+mod mod2a;
+mod mod2b;
+
+mod mymod1 {
+          use mod2a::{Foo,Bar};
+mod mod3a;
+}
+
+#[path="mod2c.rs"]
+mod mymod2;
+
+mod submod2;
diff --git a/src/tools/rustfmt/tests/source/nestedmod/mod2a.rs b/src/tools/rustfmt/tests/source/nestedmod/mod2a.rs
new file mode 100644
index 000000000..5df457a83
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/nestedmod/mod2a.rs
@@ -0,0 +1,4 @@
+// This is an empty file containing only
+// comments
+
+// ...................
diff --git a/src/tools/rustfmt/tests/source/nestedmod/mod2b.rs b/src/tools/rustfmt/tests/source/nestedmod/mod2b.rs
new file mode 100644
index 000000000..f128e2da6
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/nestedmod/mod2b.rs
@@ -0,0 +1,3 @@
+
+#[path="mod2a.rs"]
+mod c;
diff --git a/src/tools/rustfmt/tests/source/nestedmod/mod2c.rs b/src/tools/rustfmt/tests/source/nestedmod/mod2c.rs
new file mode 100644
index 000000000..eda6b233e
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/nestedmod/mod2c.rs
@@ -0,0 +1,3 @@
+// A standard mod
+
+fn a(   )     {}
diff --git a/src/tools/rustfmt/tests/source/nestedmod/mymod1/mod3a.rs b/src/tools/rustfmt/tests/source/nestedmod/mymod1/mod3a.rs
new file mode 100644
index 000000000..f28bde5e5
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/nestedmod/mymod1/mod3a.rs
@@ -0,0 +1,2 @@
+// Another mod
+fn a(          ) {       }
diff --git a/src/tools/rustfmt/tests/source/nestedmod/submod2/a.rs b/src/tools/rustfmt/tests/source/nestedmod/submod2/a.rs
new file mode 100644
index 000000000..0eaf08f0d
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/nestedmod/submod2/a.rs
@@ -0,0 +1,6 @@
+// Yet Another mod
+// Nested
+
+use c::a;
+
+fn foo(    ) {    }
diff --git a/src/tools/rustfmt/tests/source/nestedmod/submod2/mod.rs b/src/tools/rustfmt/tests/source/nestedmod/submod2/mod.rs
new file mode 100644
index 000000000..52f8be910
--- /dev/null
+++ b/src/tools/rustfmt/tests/source/nestedmod/submod2/mod.rs
@@ -0,0 +1,5 @@
+// Another mod
+
+mod a;
+
+use a::a;
-- 
cgit v1.2.3