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/test/ui/imports/issue-26873-multifile/A/B.rs   |  4 ++++
 src/test/ui/imports/issue-26873-multifile/A/C.rs   |  6 ++++++
 src/test/ui/imports/issue-26873-multifile/A/mod.rs |  5 +++++
 .../issue-26873-multifile/compiletest-ignore-dir   |  0
 .../issue-26873-multifile/issue-26873-multifile.rs | 11 ++++++++++
 .../issue-26873-multifile/issue-26873-onefile.rs   | 25 ++++++++++++++++++++++
 src/test/ui/imports/issue-26873-multifile/mod.rs   |  4 ++++
 7 files changed, 55 insertions(+)
 create mode 100644 src/test/ui/imports/issue-26873-multifile/A/B.rs
 create mode 100644 src/test/ui/imports/issue-26873-multifile/A/C.rs
 create mode 100644 src/test/ui/imports/issue-26873-multifile/A/mod.rs
 create mode 100644 src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir
 create mode 100644 src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
 create mode 100644 src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
 create mode 100644 src/test/ui/imports/issue-26873-multifile/mod.rs

(limited to 'src/test/ui/imports/issue-26873-multifile')

diff --git a/src/test/ui/imports/issue-26873-multifile/A/B.rs b/src/test/ui/imports/issue-26873-multifile/A/B.rs
new file mode 100644
index 000000000..ab7b0d816
--- /dev/null
+++ b/src/test/ui/imports/issue-26873-multifile/A/B.rs
@@ -0,0 +1,4 @@
+// run-pass
+use super::*;
+
+pub struct S;
diff --git a/src/test/ui/imports/issue-26873-multifile/A/C.rs b/src/test/ui/imports/issue-26873-multifile/A/C.rs
new file mode 100644
index 000000000..b287283df
--- /dev/null
+++ b/src/test/ui/imports/issue-26873-multifile/A/C.rs
@@ -0,0 +1,6 @@
+// run-pass
+use super::*;
+
+use super::B::S;
+
+pub struct T { i: i32 }
diff --git a/src/test/ui/imports/issue-26873-multifile/A/mod.rs b/src/test/ui/imports/issue-26873-multifile/A/mod.rs
new file mode 100644
index 000000000..0f18772bf
--- /dev/null
+++ b/src/test/ui/imports/issue-26873-multifile/A/mod.rs
@@ -0,0 +1,5 @@
+// run-pass
+pub mod B;
+pub mod C;
+
+pub use self::C::T;
diff --git a/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir b/src/test/ui/imports/issue-26873-multifile/compiletest-ignore-dir
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs b/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
new file mode 100644
index 000000000..da2acf6c9
--- /dev/null
+++ b/src/test/ui/imports/issue-26873-multifile/issue-26873-multifile.rs
@@ -0,0 +1,11 @@
+// run-pass
+#![allow(dead_code)]
+#![allow(unused_imports)]
+#![allow(non_snake_case)]
+
+// ignore-pretty issue #37195
+
+#[path = "issue-26873-multifile/mod.rs"]
+mod multifile;
+
+fn main() {}
diff --git a/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs b/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
new file mode 100644
index 000000000..f06c6499e
--- /dev/null
+++ b/src/test/ui/imports/issue-26873-multifile/issue-26873-onefile.rs
@@ -0,0 +1,25 @@
+// run-pass
+#![allow(dead_code)]
+#![allow(unused_imports)]
+#![allow(non_snake_case)]
+
+mod A {
+    pub mod B {
+        use super::*;
+
+        pub struct S;
+    }
+
+    pub mod C {
+        use super::*;
+        use super::B::S;
+
+        pub struct T;
+    }
+
+    pub use self::C::T;
+}
+
+use A::*;
+
+fn main() {}
diff --git a/src/test/ui/imports/issue-26873-multifile/mod.rs b/src/test/ui/imports/issue-26873-multifile/mod.rs
new file mode 100644
index 000000000..a1ba53f91
--- /dev/null
+++ b/src/test/ui/imports/issue-26873-multifile/mod.rs
@@ -0,0 +1,4 @@
+// run-pass
+mod A;
+
+use self::A::*;
-- 
cgit v1.2.3