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/rustdoc-ui/auxiliary/empty-fn.rs         |  3 ---
 src/test/rustdoc-ui/auxiliary/extern_macros.rs    |  7 -------
 src/test/rustdoc-ui/auxiliary/issue-61592.rs      |  3 ---
 src/test/rustdoc-ui/auxiliary/module_macro_doc.rs |  1 -
 src/test/rustdoc-ui/auxiliary/overflow.rs         | 20 --------------------
 src/test/rustdoc-ui/auxiliary/panic-item.rs       | 17 -----------------
 6 files changed, 51 deletions(-)
 delete mode 100644 src/test/rustdoc-ui/auxiliary/empty-fn.rs
 delete mode 100644 src/test/rustdoc-ui/auxiliary/extern_macros.rs
 delete mode 100644 src/test/rustdoc-ui/auxiliary/issue-61592.rs
 delete mode 100644 src/test/rustdoc-ui/auxiliary/module_macro_doc.rs
 delete mode 100644 src/test/rustdoc-ui/auxiliary/overflow.rs
 delete mode 100644 src/test/rustdoc-ui/auxiliary/panic-item.rs

(limited to 'src/test/rustdoc-ui/auxiliary')

diff --git a/src/test/rustdoc-ui/auxiliary/empty-fn.rs b/src/test/rustdoc-ui/auxiliary/empty-fn.rs
deleted file mode 100644
index 877810f15..000000000
--- a/src/test/rustdoc-ui/auxiliary/empty-fn.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// no-prefer-dynamic
-#![crate_type = "lib"]
-pub fn empty() {}
diff --git a/src/test/rustdoc-ui/auxiliary/extern_macros.rs b/src/test/rustdoc-ui/auxiliary/extern_macros.rs
deleted file mode 100644
index ee1fec4c5..000000000
--- a/src/test/rustdoc-ui/auxiliary/extern_macros.rs
+++ /dev/null
@@ -1,7 +0,0 @@
-#[macro_export]
-macro_rules! attrs_on_struct {
-    ( $( #[$attr:meta] )* ) => {
-        $( #[$attr] )*
-        pub struct ExpandedStruct;
-    }
-}
diff --git a/src/test/rustdoc-ui/auxiliary/issue-61592.rs b/src/test/rustdoc-ui/auxiliary/issue-61592.rs
deleted file mode 100644
index 57a365b3f..000000000
--- a/src/test/rustdoc-ui/auxiliary/issue-61592.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-#![crate_name = "foo"]
-
-pub trait Foo {}
diff --git a/src/test/rustdoc-ui/auxiliary/module_macro_doc.rs b/src/test/rustdoc-ui/auxiliary/module_macro_doc.rs
deleted file mode 100644
index 9d6b52b95..000000000
--- a/src/test/rustdoc-ui/auxiliary/module_macro_doc.rs
+++ /dev/null
@@ -1 +0,0 @@
-//! [`long_cat`] is really long
diff --git a/src/test/rustdoc-ui/auxiliary/overflow.rs b/src/test/rustdoc-ui/auxiliary/overflow.rs
deleted file mode 100644
index ff65936be..000000000
--- a/src/test/rustdoc-ui/auxiliary/overflow.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-pub struct B0;
-pub struct B1;
-use std::ops::Shl;
-use std::ops::Sub;
-pub type Shleft<A, B> = <A as Shl<B>>::Output;
-pub type Sub1<A> = <A as Sub<B1>>::Output;
-pub struct UInt<U, B> {
-    pub(crate) msb: U,
-    pub(crate) lsb: B,
-}
-impl<U, B, Ur, Br> Shl<UInt<Ur, Br>> for UInt<U, B>
-where
-    UInt<Ur, Br>: Sub<B1>,
-    UInt<UInt<U, B>, B0>: Shl<Sub1<UInt<Ur, Br>>>,
-{
-    type Output = Shleft<UInt<UInt<U, B>, B0>, Sub1<UInt<Ur, Br>>>;
-    fn shl(self, rhs: UInt<Ur, Br>) -> Self::Output {
-        unimplemented!()
-    }
-}
diff --git a/src/test/rustdoc-ui/auxiliary/panic-item.rs b/src/test/rustdoc-ui/auxiliary/panic-item.rs
deleted file mode 100644
index 17b26850d..000000000
--- a/src/test/rustdoc-ui/auxiliary/panic-item.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// no-prefer-dynamic
-#![crate_type = "lib"]
-#![no_std]
-#![feature(lang_items)]
-
-use core::panic::PanicInfo;
-use core::sync::atomic::{self, Ordering};
-
-#[panic_handler]
-fn panic(_info: &PanicInfo) -> ! {
-    loop {
-        atomic::compiler_fence(Ordering::SeqCst);
-    }
-}
-
-#[lang = "eh_personality"]
-fn foo() {}
-- 
cgit v1.2.3