Merging upstream version 1.68.2+dfsg1.

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

3 files changed, 0 insertions, 51 deletions

diff --git a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs b/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
deleted file mode 100644
index 5b1b1389c..000000000
--- a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-#![crate_type="lib"]
-
-// This is a file that pulls in a separate file as a submodule, where
-// that separate file has many multi-byte characters, to try to
-// encourage the compiler to trip on them.
-
-#[path = "issue-24687-mbcs-in-comments.rs"]
-mod issue_24687_mbcs_in_comments;
-
-pub use issue_24687_mbcs_in_comments::D;
diff --git a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs b/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
deleted file mode 100644
index 215145a64..000000000
--- a/src/test/ui/issues/issue-24687-embed-debuginfo/auxiliary/issue-24687-mbcs-in-comments.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use std::fmt;
-
-// This ia file with many multi-byte characters, to try to encourage
-// the compiler to trip on them.  The Drop implementation below will
-// need to have its source location embedded into the debug info for
-// the output file.
-
-// αααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααααα
-// ββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββββ
-// γγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγγ
-// δδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδδ
-// εεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεεε
-
-// ζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζζ
-// ηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηηη
-// θθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθθ
-// ιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιιι
-// κκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκκ
-
-pub struct D<X:fmt::Debug>(pub X);
-
-impl<X:fmt::Debug> Drop for D<X> {
-    fn drop(&mut self) {
-        // λλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλλ
-        println!("Dropping D({:?})", self.0);
-    }
-}
diff --git a/src/test/ui/issues/issue-24687-embed-debuginfo/main.rs b/src/test/ui/issues/issue-24687-embed-debuginfo/main.rs
deleted file mode 100644
index f08bcdfe6..000000000
--- a/src/test/ui/issues/issue-24687-embed-debuginfo/main.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// run-pass
-// aux-build:issue-24687-lib.rs
-// compile-flags:-g
-// ignore-asmjs wasm2js does not support source maps yet
-
-extern crate issue_24687_lib as d;
-
-fn main() {
-    // Create a `D`, which has a destructor whose body will be codegen'ed
-    // into the generated code here, and thus the local debuginfo will
-    // need references into the original source locations from
-    // `importer` above.
-    let _d = d::D("Hi");
-}