Merging upstream version 1.68.2+dfsg1.

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

51 files changed, 109 insertions, 12 deletions

diff --git a/tests/ui/fmt/auxiliary/format-string-proc-macro.rs b/tests/ui/fmt/auxiliary/format-string-proc-macro.rs
new file mode 100644
index 000000000..1b7ef93f4
--- /dev/null
+++ b/tests/ui/fmt/auxiliary/format-string-proc-macro.rs
@@ -0,0 +1,52 @@
+// force-host
+// no-prefer-dynamic
+
+#![crate_type = "proc-macro"]
+
+extern crate proc_macro;
+
+use proc_macro::{Delimiter, Group, Ident, Literal, Punct, Spacing, Span, TokenStream, TokenTree};
+use std::iter::FromIterator;
+
+#[proc_macro]
+pub fn foo_with_input_span(input: TokenStream) -> TokenStream {
+    let span = input.into_iter().next().unwrap().span();
+
+    let mut lit = Literal::string("{foo}");
+    lit.set_span(span);
+
+    TokenStream::from(TokenTree::Literal(lit))
+}
+
+#[proc_macro]
+pub fn err_with_input_span(input: TokenStream) -> TokenStream {
+    let span = input.into_iter().next().unwrap().span();
+
+    let mut lit = Literal::string("         }");
+    lit.set_span(span);
+
+    TokenStream::from(TokenTree::Literal(lit))
+}
+
+
+#[proc_macro]
+pub fn respan_to_invalid_format_literal(input: TokenStream) -> TokenStream {
+    let mut s = Literal::string("{");
+    s.set_span(input.into_iter().next().unwrap().span());
+    TokenStream::from_iter([
+        TokenTree::from(Ident::new("format", Span::call_site())),
+        TokenTree::from(Punct::new('!', Spacing::Alone)),
+        TokenTree::from(Group::new(Delimiter::Parenthesis, TokenTree::from(s).into())),
+    ])
+}
+
+#[proc_macro]
+pub fn capture_a_with_prepended_space_preserve_span(input: TokenStream) -> TokenStream {
+    let mut s = Literal::string(" {a}");
+    s.set_span(input.into_iter().next().unwrap().span());
+    TokenStream::from_iter([
+        TokenTree::from(Ident::new("format", Span::call_site())),
+        TokenTree::from(Punct::new('!', Spacing::Alone)),
+        TokenTree::from(Group::new(Delimiter::Parenthesis, TokenTree::from(s).into())),
+    ])
+}
diff --git a/src/test/ui/fmt/format-args-capture-issue-102057.rs b/tests/ui/fmt/format-args-capture-issue-102057.rs
index b8089d49b..b8089d49b 100644
--- a/src/test/ui/fmt/format-args-capture-issue-102057.rs
+++ b/tests/ui/fmt/format-args-capture-issue-102057.rs
diff --git a/src/test/ui/fmt/format-args-capture-issue-102057.stderr b/tests/ui/fmt/format-args-capture-issue-102057.stderr
index f2d625e7f..f2d625e7f 100644
--- a/src/test/ui/fmt/format-args-capture-issue-102057.stderr
+++ b/tests/ui/fmt/format-args-capture-issue-102057.stderr
diff --git a/src/test/ui/fmt/format-args-capture-issue-93378.rs b/tests/ui/fmt/format-args-capture-issue-93378.rs
index 9d722a028..9d722a028 100644
--- a/src/test/ui/fmt/format-args-capture-issue-93378.rs
+++ b/tests/ui/fmt/format-args-capture-issue-93378.rs
diff --git a/src/test/ui/fmt/format-args-capture-issue-93378.stderr b/tests/ui/fmt/format-args-capture-issue-93378.stderr
index 6429b0d46..6429b0d46 100644
--- a/src/test/ui/fmt/format-args-capture-issue-93378.stderr
+++ b/tests/ui/fmt/format-args-capture-issue-93378.stderr
diff --git a/src/test/ui/fmt/format-args-capture-issue-94010.rs b/tests/ui/fmt/format-args-capture-issue-94010.rs
index bd03e9c93..bd03e9c93 100644
--- a/src/test/ui/fmt/format-args-capture-issue-94010.rs
+++ b/tests/ui/fmt/format-args-capture-issue-94010.rs
diff --git a/src/test/ui/fmt/format-args-capture-issue-94010.stderr b/tests/ui/fmt/format-args-capture-issue-94010.stderr
index ed90dc855..ed90dc855 100644
--- a/src/test/ui/fmt/format-args-capture-issue-94010.stderr
+++ b/tests/ui/fmt/format-args-capture-issue-94010.stderr
diff --git a/src/test/ui/fmt/format-args-capture-macro-hygiene.rs b/tests/ui/fmt/format-args-capture-macro-hygiene.rs
index b04f80ba4..b04f80ba4 100644
--- a/src/test/ui/fmt/format-args-capture-macro-hygiene.rs
+++ b/tests/ui/fmt/format-args-capture-macro-hygiene.rs
diff --git a/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr b/tests/ui/fmt/format-args-capture-macro-hygiene.stderr
index 1b5fbd2af..1b5fbd2af 100644
--- a/src/test/ui/fmt/format-args-capture-macro-hygiene.stderr
+++ b/tests/ui/fmt/format-args-capture-macro-hygiene.stderr
diff --git a/src/test/ui/fmt/format-args-capture-missing-variables.rs b/tests/ui/fmt/format-args-capture-missing-variables.rs
index 46fc083cb..46fc083cb 100644
--- a/src/test/ui/fmt/format-args-capture-missing-variables.rs
+++ b/tests/ui/fmt/format-args-capture-missing-variables.rs
diff --git a/src/test/ui/fmt/format-args-capture-missing-variables.stderr b/tests/ui/fmt/format-args-capture-missing-variables.stderr
index d980e7be2..d980e7be2 100644
--- a/src/test/ui/fmt/format-args-capture-missing-variables.stderr
+++ b/tests/ui/fmt/format-args-capture-missing-variables.stderr
diff --git a/src/test/ui/fmt/format-args-capture.rs b/tests/ui/fmt/format-args-capture.rs
index 560352b5c..560352b5c 100644
--- a/src/test/ui/fmt/format-args-capture.rs
+++ b/tests/ui/fmt/format-args-capture.rs
diff --git a/src/test/ui/fmt/format-expanded-string.rs b/tests/ui/fmt/format-expanded-string.rs
index 4c716f08c..4c716f08c 100644
--- a/src/test/ui/fmt/format-expanded-string.rs
+++ b/tests/ui/fmt/format-expanded-string.rs
diff --git a/src/test/ui/fmt/format-expanded-string.stderr b/tests/ui/fmt/format-expanded-string.stderr
index 26ce7f269..26ce7f269 100644
--- a/src/test/ui/fmt/format-expanded-string.stderr
+++ b/tests/ui/fmt/format-expanded-string.stderr
diff --git a/src/test/ui/fmt/format-raw-string-error.rs b/tests/ui/fmt/format-raw-string-error.rs
index 9f0bc01a7..9f0bc01a7 100644
--- a/src/test/ui/fmt/format-raw-string-error.rs
+++ b/tests/ui/fmt/format-raw-string-error.rs
diff --git a/src/test/ui/fmt/format-raw-string-error.stderr b/tests/ui/fmt/format-raw-string-error.stderr
index 8d61950d8..8d61950d8 100644
--- a/src/test/ui/fmt/format-raw-string-error.stderr
+++ b/tests/ui/fmt/format-raw-string-error.stderr
diff --git a/src/test/ui/fmt/format-string-error-2.rs b/tests/ui/fmt/format-string-error-2.rs
index 1f7f0d8f6..1f7f0d8f6 100644
--- a/src/test/ui/fmt/format-string-error-2.rs
+++ b/tests/ui/fmt/format-string-error-2.rs
diff --git a/src/test/ui/fmt/format-string-error-2.stderr b/tests/ui/fmt/format-string-error-2.stderr
index 76cdfbb93..76cdfbb93 100644
--- a/src/test/ui/fmt/format-string-error-2.stderr
+++ b/tests/ui/fmt/format-string-error-2.stderr
diff --git a/src/test/ui/fmt/format-string-error.rs b/tests/ui/fmt/format-string-error.rs
index eae4f3cb5..eae4f3cb5 100644
--- a/src/test/ui/fmt/format-string-error.rs
+++ b/tests/ui/fmt/format-string-error.rs
diff --git a/src/test/ui/fmt/format-string-error.stderr b/tests/ui/fmt/format-string-error.stderr
index 8a32c2254..8a32c2254 100644
--- a/src/test/ui/fmt/format-string-error.stderr
+++ b/tests/ui/fmt/format-string-error.stderr
diff --git a/src/test/ui/fmt/format-with-yield-point.rs b/tests/ui/fmt/format-with-yield-point.rs
index e484074cc..e484074cc 100644
--- a/src/test/ui/fmt/format-with-yield-point.rs
+++ b/tests/ui/fmt/format-with-yield-point.rs
diff --git a/src/test/ui/fmt/ifmt-bad-arg.rs b/tests/ui/fmt/ifmt-bad-arg.rs
index 68861d7bf..68861d7bf 100644
--- a/src/test/ui/fmt/ifmt-bad-arg.rs
+++ b/tests/ui/fmt/ifmt-bad-arg.rs
diff --git a/src/test/ui/fmt/ifmt-bad-arg.stderr b/tests/ui/fmt/ifmt-bad-arg.stderr
index 1b595a50e..c2619d6df 100644
--- a/src/test/ui/fmt/ifmt-bad-arg.stderr
+++ b/tests/ui/fmt/ifmt-bad-arg.stderr
@@ -170,7 +170,7 @@ LL |     format!("foo %s baz", "bar");
    |                  |
    |                  help: format specifiers use curly braces: `{}`
    |
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: invalid format string: expected `'}'`, found `'t'`
   --> $DIR/ifmt-bad-arg.rs:75:1
@@ -309,9 +309,6 @@ LL |     println!("{} {:.*} {}", 1, 3.2, 4);
               found reference `&{float}`
 note: associated function defined here
   --> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
-   |
-LL |     pub fn from_usize(x: &usize) -> ArgumentV1<'_> {
-   |            ^^^^^^^^^^
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0308]: mismatched types
@@ -327,9 +324,6 @@ LL |     println!("{} {:07$.*} {}", 1, 3.2, 4);
               found reference `&{float}`
 note: associated function defined here
   --> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
-   |
-LL |     pub fn from_usize(x: &usize) -> ArgumentV1<'_> {
-   |            ^^^^^^^^^^
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to 38 previous errors
diff --git a/src/test/ui/fmt/ifmt-bad-format-args.rs b/tests/ui/fmt/ifmt-bad-format-args.rs
index ba7301561..ba7301561 100644
--- a/src/test/ui/fmt/ifmt-bad-format-args.rs
+++ b/tests/ui/fmt/ifmt-bad-format-args.rs
diff --git a/src/test/ui/fmt/ifmt-bad-format-args.stderr b/tests/ui/fmt/ifmt-bad-format-args.stderr
index 2db280c5e..2db280c5e 100644
--- a/src/test/ui/fmt/ifmt-bad-format-args.stderr
+++ b/tests/ui/fmt/ifmt-bad-format-args.stderr
diff --git a/src/test/ui/fmt/ifmt-unimpl.rs b/tests/ui/fmt/ifmt-unimpl.rs
index 258f4eea5..258f4eea5 100644
--- a/src/test/ui/fmt/ifmt-unimpl.rs
+++ b/tests/ui/fmt/ifmt-unimpl.rs
diff --git a/src/test/ui/fmt/ifmt-unimpl.stderr b/tests/ui/fmt/ifmt-unimpl.stderr
index 0e34f9135..be321c3c5 100644
--- a/src/test/ui/fmt/ifmt-unimpl.stderr
+++ b/tests/ui/fmt/ifmt-unimpl.stderr
@@ -17,9 +17,6 @@ LL |     format!("{:X}", "3");
    = note: required for `&str` to implement `UpperHex`
 note: required by a bound in `ArgumentV1::<'a>::new_upper_hex`
   --> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
-   |
-LL |     arg_new!(new_upper_hex, UpperHex);
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `ArgumentV1::<'a>::new_upper_hex`
    = note: this error originates in the macro `$crate::__export::format_args` which comes from the expansion of the macro `arg_new` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: aborting due to previous error
diff --git a/src/test/ui/fmt/ifmt-unknown-trait.rs b/tests/ui/fmt/ifmt-unknown-trait.rs
index 158152c89..158152c89 100644
--- a/src/test/ui/fmt/ifmt-unknown-trait.rs
+++ b/tests/ui/fmt/ifmt-unknown-trait.rs
diff --git a/src/test/ui/fmt/ifmt-unknown-trait.stderr b/tests/ui/fmt/ifmt-unknown-trait.stderr
index 459432bf4..459432bf4 100644
--- a/src/test/ui/fmt/ifmt-unknown-trait.stderr
+++ b/tests/ui/fmt/ifmt-unknown-trait.stderr
diff --git a/src/test/ui/fmt/incorrect-separator.rs b/tests/ui/fmt/incorrect-separator.rs
index b8d2e4a34..b8d2e4a34 100644
--- a/src/test/ui/fmt/incorrect-separator.rs
+++ b/tests/ui/fmt/incorrect-separator.rs
diff --git a/src/test/ui/fmt/incorrect-separator.stderr b/tests/ui/fmt/incorrect-separator.stderr
index 5a3e5515b..5a3e5515b 100644
--- a/src/test/ui/fmt/incorrect-separator.stderr
+++ b/tests/ui/fmt/incorrect-separator.stderr
diff --git a/tests/ui/fmt/indoc-issue-106408.rs b/tests/ui/fmt/indoc-issue-106408.rs
new file mode 100644
index 000000000..e4e3093b5
--- /dev/null
+++ b/tests/ui/fmt/indoc-issue-106408.rs
@@ -0,0 +1,9 @@
+// aux-build:format-string-proc-macro.rs
+// check-pass
+
+extern crate format_string_proc_macro;
+
+fn main() {
+    let a = 0;
+    format_string_proc_macro::capture_a_with_prepended_space_preserve_span!("{a}");
+}
diff --git a/tests/ui/fmt/issue-103826.rs b/tests/ui/fmt/issue-103826.rs
new file mode 100644
index 000000000..a11ec37a0
--- /dev/null
+++ b/tests/ui/fmt/issue-103826.rs
@@ -0,0 +1,8 @@
+fn main() {
+    format!("{\x7D");
+    //~^ ERROR 1 positional argument in format string, but no arguments were given
+    format!("\x7B\x7D");
+    //~^ ERROR 1 positional argument in format string, but no arguments were given
+    format!("{\x7D {\x7D");
+    //~^ ERROR 2 positional arguments in format string, but no arguments were given
+}
diff --git a/tests/ui/fmt/issue-103826.stderr b/tests/ui/fmt/issue-103826.stderr
new file mode 100644
index 000000000..0f27e1930
--- /dev/null
+++ b/tests/ui/fmt/issue-103826.stderr
@@ -0,0 +1,20 @@
+error: 1 positional argument in format string, but no arguments were given
+  --> $DIR/issue-103826.rs:2:14
+   |
+LL |     format!("{\x7D");
+   |              ^^^^^
+
+error: 1 positional argument in format string, but no arguments were given
+  --> $DIR/issue-103826.rs:4:14
+   |
+LL |     format!("\x7B\x7D");
+   |              ^^^^^^^^
+
+error: 2 positional arguments in format string, but no arguments were given
+  --> $DIR/issue-103826.rs:6:14
+   |
+LL |     format!("{\x7D {\x7D");
+   |              ^^^^^ ^^^^^
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/fmt/issue-104142.rs b/tests/ui/fmt/issue-104142.rs
index 8d7283a71..8d7283a71 100644
--- a/src/test/ui/fmt/issue-104142.rs
+++ b/tests/ui/fmt/issue-104142.rs
diff --git a/src/test/ui/fmt/issue-104142.stderr b/tests/ui/fmt/issue-104142.stderr
index d41644faa..d41644faa 100644
--- a/src/test/ui/fmt/issue-104142.stderr
+++ b/tests/ui/fmt/issue-104142.stderr
diff --git a/src/test/ui/fmt/issue-86085.rs b/tests/ui/fmt/issue-86085.rs
index 63d42b769..63d42b769 100644
--- a/src/test/ui/fmt/issue-86085.rs
+++ b/tests/ui/fmt/issue-86085.rs
diff --git a/src/test/ui/fmt/issue-86085.stderr b/tests/ui/fmt/issue-86085.stderr
index ee7d8a5cc..ee7d8a5cc 100644
--- a/src/test/ui/fmt/issue-86085.stderr
+++ b/tests/ui/fmt/issue-86085.stderr
diff --git a/src/test/ui/fmt/issue-89173.rs b/tests/ui/fmt/issue-89173.rs
index 96277d4d0..fc99af408 100644
--- a/src/test/ui/fmt/issue-89173.rs
+++ b/tests/ui/fmt/issue-89173.rs
@@ -10,5 +10,5 @@ fn main() {
     //~| NOTE: argument never used
     //~| NOTE: argument never used
     //~| NOTE: format specifiers use curly braces, and you have to use a positional or named parameter for the width
-    //~| NOTE: printf formatting not supported
+    //~| NOTE: printf formatting is not supported
 }
diff --git a/src/test/ui/fmt/issue-89173.stderr b/tests/ui/fmt/issue-89173.stderr
index 7b21e0a4f..ddeb769ea 100644
--- a/src/test/ui/fmt/issue-89173.stderr
+++ b/tests/ui/fmt/issue-89173.stderr
@@ -12,7 +12,7 @@ note: format specifiers use curly braces, and you have to use a positional or na
    |
 LL |     print!("%0*x", width, num);
    |             ^^^^
-   = note: printf formatting not supported; see the documentation for `std::fmt`
+   = note: printf formatting is not supported; see the documentation for `std::fmt`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/fmt/issue-91556.rs b/tests/ui/fmt/issue-91556.rs
index e782e6f90..e782e6f90 100644
--- a/src/test/ui/fmt/issue-91556.rs
+++ b/tests/ui/fmt/issue-91556.rs
diff --git a/src/test/ui/fmt/issue-91556.stderr b/tests/ui/fmt/issue-91556.stderr
index dbd5aef45..dbd5aef45 100644
--- a/src/test/ui/fmt/issue-91556.stderr
+++ b/tests/ui/fmt/issue-91556.stderr
diff --git a/tests/ui/fmt/respanned-literal-issue-106191.rs b/tests/ui/fmt/respanned-literal-issue-106191.rs
new file mode 100644
index 000000000..bb741c0ef
--- /dev/null
+++ b/tests/ui/fmt/respanned-literal-issue-106191.rs
@@ -0,0 +1,15 @@
+// aux-build:format-string-proc-macro.rs
+// check-fail
+// known-bug: #106191
+// unset-rustc-env:RUST_BACKTRACE
+// had to be reverted
+// error-pattern:internal compiler error
+// failure-status:101
+// dont-check-compiler-stderr
+
+extern crate format_string_proc_macro;
+
+fn main() {
+    format_string_proc_macro::respan_to_invalid_format_literal!("¡");
+    format_args!(r#concat!("¡        {"));
+}
diff --git a/tests/ui/fmt/respanned-literal-issue-106191.stderr b/tests/ui/fmt/respanned-literal-issue-106191.stderr
new file mode 100644
index 000000000..16717f422
--- /dev/null
+++ b/tests/ui/fmt/respanned-literal-issue-106191.stderr
@@ -0,0 +1,2 @@
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  query stack during panic:
+end of query stack
diff --git a/src/test/ui/fmt/send-sync.rs b/tests/ui/fmt/send-sync.rs
index 95ec68d1d..95ec68d1d 100644
--- a/src/test/ui/fmt/send-sync.rs
+++ b/tests/ui/fmt/send-sync.rs
diff --git a/src/test/ui/fmt/send-sync.stderr b/tests/ui/fmt/send-sync.stderr
index 3ed040c3a..3ed040c3a 100644
--- a/src/test/ui/fmt/send-sync.stderr
+++ b/tests/ui/fmt/send-sync.stderr
diff --git a/src/test/ui/fmt/struct-field-as-captured-argument.fixed b/tests/ui/fmt/struct-field-as-captured-argument.fixed
index f7244f674..f7244f674 100644
--- a/src/test/ui/fmt/struct-field-as-captured-argument.fixed
+++ b/tests/ui/fmt/struct-field-as-captured-argument.fixed
diff --git a/src/test/ui/fmt/struct-field-as-captured-argument.rs b/tests/ui/fmt/struct-field-as-captured-argument.rs
index ab5f2552b..ab5f2552b 100644
--- a/src/test/ui/fmt/struct-field-as-captured-argument.rs
+++ b/tests/ui/fmt/struct-field-as-captured-argument.rs
diff --git a/src/test/ui/fmt/struct-field-as-captured-argument.stderr b/tests/ui/fmt/struct-field-as-captured-argument.stderr
index 7ea8b4068..7ea8b4068 100644
--- a/src/test/ui/fmt/struct-field-as-captured-argument.stderr
+++ b/tests/ui/fmt/struct-field-as-captured-argument.stderr
diff --git a/src/test/ui/fmt/unicode-escape-spans.rs b/tests/ui/fmt/unicode-escape-spans.rs
index 753d91ce5..753d91ce5 100644
--- a/src/test/ui/fmt/unicode-escape-spans.rs
+++ b/tests/ui/fmt/unicode-escape-spans.rs
diff --git a/src/test/ui/fmt/unicode-escape-spans.stderr b/tests/ui/fmt/unicode-escape-spans.stderr
index 1d8473f01..1d8473f01 100644
--- a/src/test/ui/fmt/unicode-escape-spans.stderr
+++ b/tests/ui/fmt/unicode-escape-spans.stderr