Merging upstream version 1.68.2+dfsg1.

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

2 files changed, 0 insertions, 58 deletions

diff --git a/src/test/ui/lifetimes/auxiliary/issue-91763-aux.rs b/src/test/ui/lifetimes/auxiliary/issue-91763-aux.rs
deleted file mode 100644
index 0335f72b7..000000000
--- a/src/test/ui/lifetimes/auxiliary/issue-91763-aux.rs
+++ /dev/null
@@ -1,47 +0,0 @@
-// force-host
-// no-prefer-dynamic
-
-#![crate_type = "proc-macro"]
-
-//#![feature(proc_macro_diagnostic, proc_macro_span, proc_macro_def_site)]
-
-extern crate proc_macro;
-
-use proc_macro::{Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree};
-use std::iter::FromIterator;
-
-#[proc_macro_attribute]
-pub fn repro(_args: TokenStream, input: TokenStream) -> TokenStream {
-    let call_site = Span::call_site();
-    let span = input.into_iter().nth(8).unwrap().span();
-
-    //fn f(_: &::std::fmt::Formatter) {}
-    TokenStream::from_iter([
-        TokenTree::Ident(Ident::new("fn", call_site)),
-        TokenTree::Ident(Ident::new("f", call_site)),
-        TokenTree::Group(Group::new(
-            Delimiter::Parenthesis,
-            TokenStream::from_iter([
-                TokenTree::Ident(Ident::new("_", call_site)),
-                TokenTree::Punct(punct(':', Spacing::Alone, call_site)),
-                TokenTree::Punct(punct('&', Spacing::Alone, call_site)),
-                TokenTree::Punct(punct(':', Spacing::Joint, span)),
-                TokenTree::Punct(punct(':', Spacing::Alone, span)),
-                TokenTree::Ident(Ident::new("std", span)),
-                TokenTree::Punct(punct(':', Spacing::Joint, span)),
-                TokenTree::Punct(punct(':', Spacing::Alone, span)),
-                TokenTree::Ident(Ident::new("fmt", span)),
-                TokenTree::Punct(punct(':', Spacing::Joint, span)),
-                TokenTree::Punct(punct(':', Spacing::Alone, span)),
-                TokenTree::Ident(Ident::new("Formatter", span)),
-            ]),
-        )),
-        TokenTree::Group(Group::new(Delimiter::Brace, TokenStream::new())),
-    ])
-}
-
-fn punct(ch: char, spacing: Spacing, span: Span) -> Punct {
-    let mut punct = Punct::new(ch, spacing);
-    punct.set_span(span);
-    punct
-}
diff --git a/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs b/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs
deleted file mode 100644
index 58f1b81cf..000000000
--- a/src/test/ui/lifetimes/auxiliary/lifetime_bound_will_change_warning_lib.rs
+++ /dev/null
@@ -1,11 +0,0 @@
-#![crate_type = "rlib"]
-
-// Helper for testing that we get suitable warnings when lifetime
-// bound change will cause breakage.
-
-pub fn just_ref(x: &Fn()) {
-}
-
-pub fn ref_obj(x: &Box<Fn()>) {
-    // this will change to &Box<Fn()+'static>...
-}