Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 38 deletions

diff --git a/src/test/ui/did_you_mean/brackets-to-braces-single-element.stderr b/src/test/ui/did_you_mean/brackets-to-braces-single-element.stderr
deleted file mode 100644
index 6ded03e45..000000000
--- a/src/test/ui/did_you_mean/brackets-to-braces-single-element.stderr
+++ /dev/null
@@ -1,38 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/brackets-to-braces-single-element.rs:1:24
-   |
-LL | const A: [&str; 1] = { "hello" };
-   |                        ^^^^^^^ expected array `[&'static str; 1]`, found `&str`
-   |
-help: to create an array, use square brackets instead of curly braces
-   |
-LL | const A: [&str; 1] = [ "hello" ];
-   |                      ~         ~
-
-error[E0308]: mismatched types
-  --> $DIR/brackets-to-braces-single-element.rs:4:19
-   |
-LL | const B: &[u32] = &{ 1 };
-   |                   ^^^^^^ expected slice `[u32]`, found integer
-   |
-   = note: expected reference `&'static [u32]`
-              found reference `&{integer}`
-help: to create an array, use square brackets instead of curly braces
-   |
-LL | const B: &[u32] = &[ 1 ];
-   |                    ~   ~
-
-error[E0308]: mismatched types
-  --> $DIR/brackets-to-braces-single-element.rs:7:27
-   |
-LL | const C: &&[u32; 1] = &&{ 1 };
-   |                           ^ expected array `[u32; 1]`, found integer
-   |
-help: to create an array, use square brackets instead of curly braces
-   |
-LL | const C: &&[u32; 1] = &&[ 1 ];
-   |                         ~   ~
-
-error: aborting due to 3 previous errors
-
-For more information about this error, try `rustc --explain E0308`.