Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 19 deletions

diff --git a/src/test/ui/json/json-short.stderr b/src/test/ui/json/json-short.stderr
deleted file mode 100644
index 3bd85b083..000000000
--- a/src/test/ui/json/json-short.stderr
+++ /dev/null
@@ -1,19 +0,0 @@
-{"message":"`main` function not found in crate `json_short`","code":{"code":"E0601","explanation":"No `main` function was found in a binary crate.
-
-To fix this error, add a `main` function:
-
-```
-fn main() {
-    // Your program will start here.
-    println!(\"Hello world!\");
-}
-```
-
-If you don't know the basics of Rust, you can look at the
-[Rust Book][rust-book] to get started.
-
-[rust-book]: https://doc.rust-lang.org/book/
-"},"level":"error","spans":[{"file_name":"$DIR/json-short.rs","byte_start":62,"byte_end":62,"line_start":1,"line_end":1,"column_start":63,"column_end":63,"is_primary":true,"text":[{"text":"// compile-flags: --json=diagnostic-short --error-format=json","highlight_start":63,"highlight_end":63}],"label":"consider adding a `main` function to `$DIR/json-short.rs`","suggested_replacement":null,"suggestion_applicability":null,"expansion":null}],"children":[],"rendered":"$DIR/json-short.rs:1:63: error[E0601]: `main` function not found in crate `json_short`
-"}
-{"message":"aborting due to previous error","code":null,"level":"error","spans":[],"children":[],"rendered":"error: aborting due to previous error
-"}