From dc0db358abe19481e475e10c32149b53370f1a1c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:57:31 +0200 Subject: Merging upstream version 1.72.1+dfsg1. Signed-off-by: Daniel Baumann --- vendor/proc-macro-error/tests/ui/abort.rs | 11 ----- vendor/proc-macro-error/tests/ui/abort.stderr | 48 ---------------------- vendor/proc-macro-error/tests/ui/append_dummy.rs | 13 ------ .../proc-macro-error/tests/ui/append_dummy.stderr | 5 --- .../proc-macro-error/tests/ui/children_messages.rs | 6 --- .../tests/ui/children_messages.stderr | 23 ----------- vendor/proc-macro-error/tests/ui/dummy.rs | 13 ------ vendor/proc-macro-error/tests/ui/dummy.stderr | 5 --- vendor/proc-macro-error/tests/ui/emit.rs | 7 ---- vendor/proc-macro-error/tests/ui/emit.stderr | 48 ---------------------- .../tests/ui/explicit_span_range.rs | 6 --- .../tests/ui/explicit_span_range.stderr | 5 --- vendor/proc-macro-error/tests/ui/misuse.rs | 11 ----- vendor/proc-macro-error/tests/ui/misuse.stderr | 13 ------ .../proc-macro-error/tests/ui/multiple_tokens.rs | 6 --- .../tests/ui/multiple_tokens.stderr | 5 --- vendor/proc-macro-error/tests/ui/not_proc_macro.rs | 4 -- .../tests/ui/not_proc_macro.stderr | 10 ----- vendor/proc-macro-error/tests/ui/option_ext.rs | 6 --- vendor/proc-macro-error/tests/ui/option_ext.stderr | 7 ---- .../proc-macro-error/tests/ui/proc_macro_hack.rs | 10 ----- .../tests/ui/proc_macro_hack.stderr | 26 ------------ vendor/proc-macro-error/tests/ui/result_ext.rs | 7 ---- vendor/proc-macro-error/tests/ui/result_ext.stderr | 11 ----- vendor/proc-macro-error/tests/ui/to_tokens_span.rs | 6 --- .../tests/ui/to_tokens_span.stderr | 11 ----- .../proc-macro-error/tests/ui/unknown_setting.rs | 4 -- .../tests/ui/unknown_setting.stderr | 5 --- .../proc-macro-error/tests/ui/unrelated_panic.rs | 6 --- .../tests/ui/unrelated_panic.stderr | 7 ---- 30 files changed, 345 deletions(-) delete mode 100644 vendor/proc-macro-error/tests/ui/abort.rs delete mode 100644 vendor/proc-macro-error/tests/ui/abort.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/append_dummy.rs delete mode 100644 vendor/proc-macro-error/tests/ui/append_dummy.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/children_messages.rs delete mode 100644 vendor/proc-macro-error/tests/ui/children_messages.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/dummy.rs delete mode 100644 vendor/proc-macro-error/tests/ui/dummy.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/emit.rs delete mode 100644 vendor/proc-macro-error/tests/ui/emit.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/explicit_span_range.rs delete mode 100644 vendor/proc-macro-error/tests/ui/explicit_span_range.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/misuse.rs delete mode 100644 vendor/proc-macro-error/tests/ui/misuse.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/multiple_tokens.rs delete mode 100644 vendor/proc-macro-error/tests/ui/multiple_tokens.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/not_proc_macro.rs delete mode 100644 vendor/proc-macro-error/tests/ui/not_proc_macro.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/option_ext.rs delete mode 100644 vendor/proc-macro-error/tests/ui/option_ext.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/proc_macro_hack.rs delete mode 100644 vendor/proc-macro-error/tests/ui/proc_macro_hack.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/result_ext.rs delete mode 100644 vendor/proc-macro-error/tests/ui/result_ext.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/to_tokens_span.rs delete mode 100644 vendor/proc-macro-error/tests/ui/to_tokens_span.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/unknown_setting.rs delete mode 100644 vendor/proc-macro-error/tests/ui/unknown_setting.stderr delete mode 100644 vendor/proc-macro-error/tests/ui/unrelated_panic.rs delete mode 100644 vendor/proc-macro-error/tests/ui/unrelated_panic.stderr (limited to 'vendor/proc-macro-error/tests/ui') diff --git a/vendor/proc-macro-error/tests/ui/abort.rs b/vendor/proc-macro-error/tests/ui/abort.rs deleted file mode 100644 index f63118251..000000000 --- a/vendor/proc-macro-error/tests/ui/abort.rs +++ /dev/null @@ -1,11 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -abort_from!(one, two); -abort_to_string!(one, two); -abort_format!(one, two); -direct_abort!(one, two); -abort_notes!(one, two); -abort_call_site_test!(one, two); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/abort.stderr b/vendor/proc-macro-error/tests/ui/abort.stderr deleted file mode 100644 index c5399d9d9..000000000 --- a/vendor/proc-macro-error/tests/ui/abort.stderr +++ /dev/null @@ -1,48 +0,0 @@ -error: abort!(span, from) test - --> $DIR/abort.rs:4:13 - | -4 | abort_from!(one, two); - | ^^^ - -error: abort!(span, single_expr) test - --> $DIR/abort.rs:5:18 - | -5 | abort_to_string!(one, two); - | ^^^ - -error: abort!(span, expr1, expr2) test - --> $DIR/abort.rs:6:15 - | -6 | abort_format!(one, two); - | ^^^ - -error: Diagnostic::abort() test - --> $DIR/abort.rs:7:15 - | -7 | direct_abort!(one, two); - | ^^^ - -error: This is an error - - = note: simple note - = help: simple help - = help: simple hint - = note: simple yay - = note: format note - = note: Some note - = note: spanned simple note - = note: spanned format note - = note: Some note - - --> $DIR/abort.rs:8:14 - | -8 | abort_notes!(one, two); - | ^^^ - -error: abort_call_site! test - --> $DIR/abort.rs:9:1 - | -9 | abort_call_site_test!(one, two); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/vendor/proc-macro-error/tests/ui/append_dummy.rs b/vendor/proc-macro-error/tests/ui/append_dummy.rs deleted file mode 100644 index 53d6feacc..000000000 --- a/vendor/proc-macro-error/tests/ui/append_dummy.rs +++ /dev/null @@ -1,13 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -enum NeedDefault { - A, - B -} - -append_dummy!(need_default); - -fn main() { - let _ = NeedDefault::default(); -} diff --git a/vendor/proc-macro-error/tests/ui/append_dummy.stderr b/vendor/proc-macro-error/tests/ui/append_dummy.stderr deleted file mode 100644 index 8a47ddaac..000000000 --- a/vendor/proc-macro-error/tests/ui/append_dummy.stderr +++ /dev/null @@ -1,5 +0,0 @@ -error: append_dummy test - --> $DIR/append_dummy.rs:9:15 - | -9 | append_dummy!(need_default); - | ^^^^^^^^^^^^ diff --git a/vendor/proc-macro-error/tests/ui/children_messages.rs b/vendor/proc-macro-error/tests/ui/children_messages.rs deleted file mode 100644 index fb9e6dc69..000000000 --- a/vendor/proc-macro-error/tests/ui/children_messages.rs +++ /dev/null @@ -1,6 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -children_messages!(one, two, three, four); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/children_messages.stderr b/vendor/proc-macro-error/tests/ui/children_messages.stderr deleted file mode 100644 index 3b49d8316..000000000 --- a/vendor/proc-macro-error/tests/ui/children_messages.stderr +++ /dev/null @@ -1,23 +0,0 @@ -error: main macro message - --> $DIR/children_messages.rs:4:20 - | -4 | children_messages!(one, two, three, four); - | ^^^ - -error: child message - --> $DIR/children_messages.rs:4:25 - | -4 | children_messages!(one, two, three, four); - | ^^^ - -error: main syn::Error - --> $DIR/children_messages.rs:4:30 - | -4 | children_messages!(one, two, three, four); - | ^^^^^ - -error: child syn::Error - --> $DIR/children_messages.rs:4:37 - | -4 | children_messages!(one, two, three, four); - | ^^^^ diff --git a/vendor/proc-macro-error/tests/ui/dummy.rs b/vendor/proc-macro-error/tests/ui/dummy.rs deleted file mode 100644 index caa482788..000000000 --- a/vendor/proc-macro-error/tests/ui/dummy.rs +++ /dev/null @@ -1,13 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -enum NeedDefault { - A, - B -} - -dummy!(need_default); - -fn main() { - let _ = NeedDefault::default(); -} diff --git a/vendor/proc-macro-error/tests/ui/dummy.stderr b/vendor/proc-macro-error/tests/ui/dummy.stderr deleted file mode 100644 index bae078afa..000000000 --- a/vendor/proc-macro-error/tests/ui/dummy.stderr +++ /dev/null @@ -1,5 +0,0 @@ -error: set_dummy test - --> $DIR/dummy.rs:9:8 - | -9 | dummy!(need_default); - | ^^^^^^^^^^^^ diff --git a/vendor/proc-macro-error/tests/ui/emit.rs b/vendor/proc-macro-error/tests/ui/emit.rs deleted file mode 100644 index c5c7db095..000000000 --- a/vendor/proc-macro-error/tests/ui/emit.rs +++ /dev/null @@ -1,7 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -emit!(one, two, three, four, five); -emit_notes!(one, two); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/emit.stderr b/vendor/proc-macro-error/tests/ui/emit.stderr deleted file mode 100644 index 9484bd628..000000000 --- a/vendor/proc-macro-error/tests/ui/emit.stderr +++ /dev/null @@ -1,48 +0,0 @@ -error: emit!(span, from) test - --> $DIR/emit.rs:4:7 - | -4 | emit!(one, two, three, four, five); - | ^^^ - -error: emit!(span, expr1, expr2) test - --> $DIR/emit.rs:4:12 - | -4 | emit!(one, two, three, four, five); - | ^^^ - -error: emit!(span, single_expr) test - --> $DIR/emit.rs:4:17 - | -4 | emit!(one, two, three, four, five); - | ^^^^^ - -error: Diagnostic::emit() test - --> $DIR/emit.rs:4:24 - | -4 | emit!(one, two, three, four, five); - | ^^^^ - -error: emit_call_site_error!(expr) test - --> $DIR/emit.rs:4:1 - | -4 | emit!(one, two, three, four, five); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) - -error: This is an error - - = note: simple note - = help: simple help - = help: simple hint - = note: simple yay - = note: format note - = note: Some note - = note: spanned simple note - = note: spanned format note - = note: Some note - - --> $DIR/emit.rs:5:13 - | -5 | emit_notes!(one, two); - | ^^^ diff --git a/vendor/proc-macro-error/tests/ui/explicit_span_range.rs b/vendor/proc-macro-error/tests/ui/explicit_span_range.rs deleted file mode 100644 index 82bbebcc5..000000000 --- a/vendor/proc-macro-error/tests/ui/explicit_span_range.rs +++ /dev/null @@ -1,6 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -explicit_span_range!(one, two, three, four); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/explicit_span_range.stderr b/vendor/proc-macro-error/tests/ui/explicit_span_range.stderr deleted file mode 100644 index 781a71e76..000000000 --- a/vendor/proc-macro-error/tests/ui/explicit_span_range.stderr +++ /dev/null @@ -1,5 +0,0 @@ -error: explicit SpanRange - --> $DIR/explicit_span_range.rs:4:22 - | -4 | explicit_span_range!(one, two, three, four); - | ^^^^^^^^^^^^^^^ diff --git a/vendor/proc-macro-error/tests/ui/misuse.rs b/vendor/proc-macro-error/tests/ui/misuse.rs deleted file mode 100644 index e6d2d2497..000000000 --- a/vendor/proc-macro-error/tests/ui/misuse.rs +++ /dev/null @@ -1,11 +0,0 @@ -extern crate proc_macro_error; -use proc_macro_error::abort; - -struct Foo; - -#[allow(unused)] -fn foo() { - abort!(Foo, "BOOM"); -} - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/misuse.stderr b/vendor/proc-macro-error/tests/ui/misuse.stderr deleted file mode 100644 index 8eaf6456f..000000000 --- a/vendor/proc-macro-error/tests/ui/misuse.stderr +++ /dev/null @@ -1,13 +0,0 @@ -error[E0599]: no method named `FIRST_ARG_MUST_EITHER_BE_Span_OR_IMPLEMENT_ToTokens_OR_BE_SpanRange` found for reference `&Foo` in the current scope - --> $DIR/misuse.rs:8:5 - | -4 | struct Foo; - | ----------- doesn't satisfy `Foo: quote::to_tokens::ToTokens` -... -8 | abort!(Foo, "BOOM"); - | ^^^^^^^^^^^^^^^^^^^^ method not found in `&Foo` - | - = note: the method `FIRST_ARG_MUST_EITHER_BE_Span_OR_IMPLEMENT_ToTokens_OR_BE_SpanRange` exists but the following trait bounds were not satisfied: - `Foo: quote::to_tokens::ToTokens` - which is required by `&Foo: proc_macro_error::__export::ToTokensAsSpanRange` - = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/vendor/proc-macro-error/tests/ui/multiple_tokens.rs b/vendor/proc-macro-error/tests/ui/multiple_tokens.rs deleted file mode 100644 index 215928f6f..000000000 --- a/vendor/proc-macro-error/tests/ui/multiple_tokens.rs +++ /dev/null @@ -1,6 +0,0 @@ -extern crate test_crate; - -#[test_crate::multiple_tokens] -type T = (); - -fn main() {} \ No newline at end of file diff --git a/vendor/proc-macro-error/tests/ui/multiple_tokens.stderr b/vendor/proc-macro-error/tests/ui/multiple_tokens.stderr deleted file mode 100644 index c6172c6cc..000000000 --- a/vendor/proc-macro-error/tests/ui/multiple_tokens.stderr +++ /dev/null @@ -1,5 +0,0 @@ -error: ... - --> $DIR/multiple_tokens.rs:4:1 - | -4 | type T = (); - | ^^^^^^^^^^^^ diff --git a/vendor/proc-macro-error/tests/ui/not_proc_macro.rs b/vendor/proc-macro-error/tests/ui/not_proc_macro.rs deleted file mode 100644 index e241c5cd2..000000000 --- a/vendor/proc-macro-error/tests/ui/not_proc_macro.rs +++ /dev/null @@ -1,4 +0,0 @@ -use proc_macro_error::proc_macro_error; - -#[proc_macro_error] -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/not_proc_macro.stderr b/vendor/proc-macro-error/tests/ui/not_proc_macro.stderr deleted file mode 100644 index f19f01bd8..000000000 --- a/vendor/proc-macro-error/tests/ui/not_proc_macro.stderr +++ /dev/null @@ -1,10 +0,0 @@ -error: #[proc_macro_error] attribute can be used only with procedural macros - - = hint: if you are really sure that #[proc_macro_error] should be applied to this exact function, use #[proc_macro_error(allow_not_macro)] - - --> $DIR/not_proc_macro.rs:3:1 - | -3 | #[proc_macro_error] - | ^^^^^^^^^^^^^^^^^^^ - | - = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/vendor/proc-macro-error/tests/ui/option_ext.rs b/vendor/proc-macro-error/tests/ui/option_ext.rs deleted file mode 100644 index dfbfc0383..000000000 --- a/vendor/proc-macro-error/tests/ui/option_ext.rs +++ /dev/null @@ -1,6 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -option_ext!(one, two); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/option_ext.stderr b/vendor/proc-macro-error/tests/ui/option_ext.stderr deleted file mode 100644 index 91b151ec2..000000000 --- a/vendor/proc-macro-error/tests/ui/option_ext.stderr +++ /dev/null @@ -1,7 +0,0 @@ -error: Option::expect_or_abort() test - --> $DIR/option_ext.rs:4:1 - | -4 | option_ext!(one, two); - | ^^^^^^^^^^^^^^^^^^^^^^ - | - = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/vendor/proc-macro-error/tests/ui/proc_macro_hack.rs b/vendor/proc-macro-error/tests/ui/proc_macro_hack.rs deleted file mode 100644 index 2504bdd40..000000000 --- a/vendor/proc-macro-error/tests/ui/proc_macro_hack.rs +++ /dev/null @@ -1,10 +0,0 @@ -// Adapted from https://github.com/dtolnay/proc-macro-hack/blob/master/example/src/main.rs -// Licensed under either of Apache License, Version 2.0 or MIT license at your option. - -use proc_macro_hack_test::add_one; - -fn main() { - let two = 2; - let nine = add_one!(two) + add_one!(2 + 3); - println!("nine = {}", nine); -} diff --git a/vendor/proc-macro-error/tests/ui/proc_macro_hack.stderr b/vendor/proc-macro-error/tests/ui/proc_macro_hack.stderr deleted file mode 100644 index 0e984f918..000000000 --- a/vendor/proc-macro-error/tests/ui/proc_macro_hack.stderr +++ /dev/null @@ -1,26 +0,0 @@ -error: BOOM - --> $DIR/proc_macro_hack.rs:8:25 - | -8 | let nine = add_one!(two) + add_one!(2 + 3); - | ^^^ - | - = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) - -error: BOOM - --> $DIR/proc_macro_hack.rs:8:41 - | -8 | let nine = add_one!(two) + add_one!(2 + 3); - | ^^^^^ - | - = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) - -warning: unreachable expression - --> $DIR/proc_macro_hack.rs:8:32 - | -8 | let nine = add_one!(two) + add_one!(2 + 3); - | ------------- ^^^^^^^^^^^^^^^ unreachable expression - | | - | any code following this expression is unreachable - | - = note: `#[warn(unreachable_code)]` on by default - = note: this warning originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/vendor/proc-macro-error/tests/ui/result_ext.rs b/vendor/proc-macro-error/tests/ui/result_ext.rs deleted file mode 100644 index bdd560dba..000000000 --- a/vendor/proc-macro-error/tests/ui/result_ext.rs +++ /dev/null @@ -1,7 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -result_unwrap_or_abort!(one, two); -result_expect_or_abort!(one, two); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/result_ext.stderr b/vendor/proc-macro-error/tests/ui/result_ext.stderr deleted file mode 100644 index f2dc0e423..000000000 --- a/vendor/proc-macro-error/tests/ui/result_ext.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error: Result::unwrap_or_abort() test - --> $DIR/result_ext.rs:4:25 - | -4 | result_unwrap_or_abort!(one, two); - | ^^^ - -error: BOOM: Result::expect_or_abort() test - --> $DIR/result_ext.rs:5:25 - | -5 | result_expect_or_abort!(one, two); - | ^^^ diff --git a/vendor/proc-macro-error/tests/ui/to_tokens_span.rs b/vendor/proc-macro-error/tests/ui/to_tokens_span.rs deleted file mode 100644 index a7c3fc976..000000000 --- a/vendor/proc-macro-error/tests/ui/to_tokens_span.rs +++ /dev/null @@ -1,6 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -to_tokens_span!(std::option::Option); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/to_tokens_span.stderr b/vendor/proc-macro-error/tests/ui/to_tokens_span.stderr deleted file mode 100644 index b8c496826..000000000 --- a/vendor/proc-macro-error/tests/ui/to_tokens_span.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error: whole type - --> $DIR/to_tokens_span.rs:4:17 - | -4 | to_tokens_span!(std::option::Option); - | ^^^^^^^^^^^^^^^^^^^ - -error: explicit .span() - --> $DIR/to_tokens_span.rs:4:17 - | -4 | to_tokens_span!(std::option::Option); - | ^^^ diff --git a/vendor/proc-macro-error/tests/ui/unknown_setting.rs b/vendor/proc-macro-error/tests/ui/unknown_setting.rs deleted file mode 100644 index d8e58eaf8..000000000 --- a/vendor/proc-macro-error/tests/ui/unknown_setting.rs +++ /dev/null @@ -1,4 +0,0 @@ -use proc_macro_error::proc_macro_error; - -#[proc_macro_error(allow_not_macro, assert_unwind_safe, trololo)] -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/unknown_setting.stderr b/vendor/proc-macro-error/tests/ui/unknown_setting.stderr deleted file mode 100644 index a55de0b31..000000000 --- a/vendor/proc-macro-error/tests/ui/unknown_setting.stderr +++ /dev/null @@ -1,5 +0,0 @@ -error: unknown setting `trololo`, expected one of `assert_unwind_safe`, `allow_not_macro`, `proc_macro_hack` - --> $DIR/unknown_setting.rs:3:57 - | -3 | #[proc_macro_error(allow_not_macro, assert_unwind_safe, trololo)] - | ^^^^^^^ diff --git a/vendor/proc-macro-error/tests/ui/unrelated_panic.rs b/vendor/proc-macro-error/tests/ui/unrelated_panic.rs deleted file mode 100644 index c74e3e062..000000000 --- a/vendor/proc-macro-error/tests/ui/unrelated_panic.rs +++ /dev/null @@ -1,6 +0,0 @@ -extern crate test_crate; -use test_crate::*; - -unrelated_panic!(); - -fn main() {} diff --git a/vendor/proc-macro-error/tests/ui/unrelated_panic.stderr b/vendor/proc-macro-error/tests/ui/unrelated_panic.stderr deleted file mode 100644 index d46d689f2..000000000 --- a/vendor/proc-macro-error/tests/ui/unrelated_panic.stderr +++ /dev/null @@ -1,7 +0,0 @@ -error: proc macro panicked - --> $DIR/unrelated_panic.rs:4:1 - | -4 | unrelated_panic!(); - | ^^^^^^^^^^^^^^^^^^^ - | - = help: message: unrelated panic test -- cgit v1.2.3