Adding upstream version 1.64.0+dfsg1.upstream/1.64.0+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

19 files changed, 73 insertions, 0 deletions

diff --git a/src/test/ui/non_modrs_mods/foors_mod.rs b/src/test/ui/non_modrs_mods/foors_mod.rs
new file mode 100644
index 000000000..5bf35fbf7
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/foors_mod.rs
@@ -0,0 +1,10 @@
+// run-pass
+//
+// ignore-test: not a test, used by non_modrs_mods.rs
+
+pub mod inner_modrs_mod;
+pub mod inner_foors_mod;
+pub mod inline {
+    #[path="somename.rs"]
+    pub mod innie;
+}
diff --git a/src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir b/src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs b/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs
new file mode 100644
index 000000000..04585f918
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
new file mode 100644
index 000000000..4d8eb350b
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub mod innest;
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
new file mode 100644
index 000000000..04585f918
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
new file mode 100644
index 000000000..04585f918
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
new file mode 100644
index 000000000..4d8eb350b
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub mod innest;
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir b/src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs b/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs
new file mode 100644
index 000000000..04585f918
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
new file mode 100644
index 000000000..4d8eb350b
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub mod innest;
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
new file mode 100644
index 000000000..04585f918
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
new file mode 100644
index 000000000..04585f918
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
new file mode 100644
index 000000000..4d8eb350b
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub mod innest;
diff --git a/src/test/ui/non_modrs_mods/modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/modrs_mod/mod.rs
new file mode 100644
index 000000000..c8efa66d6
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/modrs_mod/mod.rs
@@ -0,0 +1,8 @@
+// run-pass
+
+pub mod inner_modrs_mod;
+pub mod inner_foors_mod;
+pub mod inline {
+    #[path="somename.rs"]
+    pub mod innie;
+}
diff --git a/src/test/ui/non_modrs_mods/non_modrs_mods.rs b/src/test/ui/non_modrs_mods/non_modrs_mods.rs
new file mode 100644
index 000000000..f664b0166
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/non_modrs_mods.rs
@@ -0,0 +1,16 @@
+// run-pass
+//
+// ignore-pretty issue #37195
+pub mod modrs_mod;
+pub mod foors_mod;
+#[path = "some_crazy_attr_mod_dir/arbitrary_name.rs"]
+pub mod attr_mod;
+pub fn main() {
+    modrs_mod::inner_modrs_mod::innest::foo();
+    modrs_mod::inner_foors_mod::innest::foo();
+    modrs_mod::inline::innie::foo();
+    foors_mod::inner_modrs_mod::innest::foo();
+    foors_mod::inner_foors_mod::innest::foo();
+    foors_mod::inline::innie::foo();
+    attr_mod::inner_modrs_mod::innest::foo();
+}
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
new file mode 100644
index 000000000..7d5d5b9e5
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub mod inner_modrs_mod;
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
new file mode 100644
index 000000000..04585f918
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub fn foo() {}
diff --git a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
new file mode 100644
index 000000000..4d8eb350b
--- /dev/null
+++ b/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
@@ -0,0 +1,3 @@
+// run-pass
+
+pub mod innest;