From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/non_modrs_mods/foors_mod.rs                  | 10 ----------
 .../ui/non_modrs_mods/foors_mod/compiletest-ignore-dir   |  0
 src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs  |  3 ---
 src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs  |  3 ---
 .../non_modrs_mods/foors_mod/inner_foors_mod/innest.rs   |  3 ---
 .../non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs   |  3 ---
 .../ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs   |  3 ---
 .../ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir   |  0
 src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs  |  3 ---
 src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs  |  3 ---
 .../non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs   |  3 ---
 .../non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs   |  3 ---
 .../ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs   |  3 ---
 src/test/ui/non_modrs_mods/modrs_mod/mod.rs              |  8 --------
 src/test/ui/non_modrs_mods/non_modrs_mods.rs             | 16 ----------------
 .../some_crazy_attr_mod_dir/arbitrary_name.rs            |  3 ---
 .../some_crazy_attr_mod_dir/compiletest-ignore-dir       |  0
 .../some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs    |  3 ---
 .../some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs       |  3 ---
 19 files changed, 73 deletions(-)
 delete mode 100644 src/test/ui/non_modrs_mods/foors_mod.rs
 delete mode 100644 src/test/ui/non_modrs_mods/foors_mod/compiletest-ignore-dir
 delete mode 100644 src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs
 delete mode 100644 src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
 delete mode 100644 src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
 delete mode 100644 src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
 delete mode 100644 src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
 delete mode 100644 src/test/ui/non_modrs_mods/modrs_mod/compiletest-ignore-dir
 delete mode 100644 src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs
 delete mode 100644 src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
 delete mode 100644 src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
 delete mode 100644 src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
 delete mode 100644 src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
 delete mode 100644 src/test/ui/non_modrs_mods/modrs_mod/mod.rs
 delete mode 100644 src/test/ui/non_modrs_mods/non_modrs_mods.rs
 delete mode 100644 src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
 delete mode 100644 src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir
 delete mode 100644 src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
 delete mode 100644 src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs

(limited to 'src/test/ui/non_modrs_mods')

diff --git a/src/test/ui/non_modrs_mods/foors_mod.rs b/src/test/ui/non_modrs_mods/foors_mod.rs
deleted file mode 100644
index 5bf35fbf7..000000000
--- a/src/test/ui/non_modrs_mods/foors_mod.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index 04585f918..000000000
--- a/src/test/ui/non_modrs_mods/foors_mod/inline/somename.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 4d8eb350b..000000000
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 04585f918..000000000
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 04585f918..000000000
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 4d8eb350b..000000000
--- a/src/test/ui/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index 04585f918..000000000
--- a/src/test/ui/non_modrs_mods/modrs_mod/inline/somename.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 4d8eb350b..000000000
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 04585f918..000000000
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 04585f918..000000000
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 4d8eb350b..000000000
--- a/src/test/ui/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index c8efa66d6..000000000
--- a/src/test/ui/non_modrs_mods/modrs_mod/mod.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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
deleted file mode 100644
index f664b0166..000000000
--- a/src/test/ui/non_modrs_mods/non_modrs_mods.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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
deleted file mode 100644
index 7d5d5b9e5..000000000
--- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index e69de29bb..000000000
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
deleted file mode 100644
index 04585f918..000000000
--- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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
deleted file mode 100644
index 4d8eb350b..000000000
--- a/src/test/ui/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// run-pass
-
-pub mod innest;
-- 
cgit v1.2.3