Merging upstream version 1.68.2+dfsg1.

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

2 files changed, 0 insertions, 32 deletions

diff --git a/src/test/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs b/src/test/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
deleted file mode 100644
index 26871c98d..000000000
--- a/src/test/ui/lint/unsafe_code/auxiliary/forge_unsafe_block.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// force-host
-// no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
-extern crate proc_macro;
-
-use proc_macro::{Delimiter, Group, Ident, Span, TokenStream, TokenTree};
-
-#[proc_macro]
-pub fn forge_unsafe_block(input: TokenStream) -> TokenStream {
-    let mut output = TokenStream::new();
-    output.extend(Some(TokenTree::from(Ident::new("unsafe", Span::call_site()))));
-    output.extend(Some(TokenTree::from(Group::new(Delimiter::Brace, input))));
-    output
-}
diff --git a/src/test/ui/lint/unsafe_code/forge_unsafe_block.rs b/src/test/ui/lint/unsafe_code/forge_unsafe_block.rs
deleted file mode 100644
index a1bd7b413..000000000
--- a/src/test/ui/lint/unsafe_code/forge_unsafe_block.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-// check-pass
-// aux-build:forge_unsafe_block.rs
-
-#[macro_use]
-extern crate forge_unsafe_block;
-
-unsafe fn foo() {}
-
-#[forbid(unsafe_code)]
-fn main() {
-    // `forbid` doesn't work for non-user-provided unsafe blocks.
-    // see `UnsafeCode::check_expr`.
-    forge_unsafe_block! {
-        foo();
-    }
-}