From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .../suggest-blanket-impl-local-trait.stderr        | 100 ---------------------
 1 file changed, 100 deletions(-)
 delete mode 100644 src/test/ui/suggestions/suggest-blanket-impl-local-trait.stderr

(limited to 'src/test/ui/suggestions/suggest-blanket-impl-local-trait.stderr')

diff --git a/src/test/ui/suggestions/suggest-blanket-impl-local-trait.stderr b/src/test/ui/suggestions/suggest-blanket-impl-local-trait.stderr
deleted file mode 100644
index 398caa98b..000000000
--- a/src/test/ui/suggestions/suggest-blanket-impl-local-trait.stderr
+++ /dev/null
@@ -1,100 +0,0 @@
-error[E0782]: trait objects must include the `dyn` keyword
-  --> $DIR/suggest-blanket-impl-local-trait.rs:13:24
-   |
-LL | impl LocalTraitTwo for LocalTraitOne {}
-   |                        ^^^^^^^^^^^^^
-   |
-help: add `dyn` keyword before this trait
-   |
-LL | impl LocalTraitTwo for dyn LocalTraitOne {}
-   |                        +++
-help: alternatively use a blanket implementation to implement `LocalTraitTwo` for all types that also implement `LocalTraitOne`
-   |
-LL | impl<T: LocalTraitOne> LocalTraitTwo for T {}
-   |     ++++++++++++++++++                   ~
-
-error[E0782]: trait objects must include the `dyn` keyword
-  --> $DIR/suggest-blanket-impl-local-trait.rs:18:23
-   |
-LL | impl fmt::Display for LocalTraitOne {
-   |                       ^^^^^^^^^^^^^
-   |
-help: add `dyn` keyword before this trait
-   |
-LL | impl fmt::Display for dyn LocalTraitOne {
-   |                       +++
-
-error[E0782]: trait objects must include the `dyn` keyword
-  --> $DIR/suggest-blanket-impl-local-trait.rs:26:23
-   |
-LL | impl fmt::Display for LocalTraitTwo + Send {
-   |                       ^^^^^^^^^^^^^^^^^^^^
-   |
-help: add `dyn` keyword before this trait
-   |
-LL | impl fmt::Display for dyn LocalTraitTwo + Send {
-   |                       +++
-
-error[E0782]: trait objects must include the `dyn` keyword
-  --> $DIR/suggest-blanket-impl-local-trait.rs:34:24
-   |
-LL | impl LocalTraitOne for fmt::Display {}
-   |                        ^^^^^^^^^^^^
-   |
-help: add `dyn` keyword before this trait
-   |
-LL | impl LocalTraitOne for dyn fmt::Display {}
-   |                        +++
-help: alternatively use a blanket implementation to implement `LocalTraitOne` for all types that also implement `fmt::Display`
-   |
-LL | impl<T: fmt::Display> LocalTraitOne for T {}
-   |     +++++++++++++++++                   ~
-
-error[E0782]: trait objects must include the `dyn` keyword
-  --> $DIR/suggest-blanket-impl-local-trait.rs:40:24
-   |
-LL | impl LocalTraitOne for fmt::Display + Send {}
-   |                        ^^^^^^^^^^^^^^^^^^^
-   |
-help: add `dyn` keyword before this trait
-   |
-LL | impl LocalTraitOne for dyn fmt::Display + Send {}
-   |                        +++
-help: alternatively use a blanket implementation to implement `LocalTraitOne` for all types that also implement `fmt::Display + Send`
-   |
-LL | impl<T: fmt::Display + Send> LocalTraitOne for T {}
-   |     ++++++++++++++++++++++++                   ~
-
-error[E0782]: trait objects must include the `dyn` keyword
-  --> $DIR/suggest-blanket-impl-local-trait.rs:46:29
-   |
-LL | impl<E> GenericTrait<E> for LocalTraitOne {}
-   |                             ^^^^^^^^^^^^^
-   |
-help: add `dyn` keyword before this trait
-   |
-LL | impl<E> GenericTrait<E> for dyn LocalTraitOne {}
-   |                             +++
-help: alternatively use a blanket implementation to implement `GenericTrait<E>` for all types that also implement `LocalTraitOne`
-   |
-LL | impl<E, T: LocalTraitOne> GenericTrait<E> for T {}
-   |       ++++++++++++++++++                      ~
-
-error[E0782]: trait objects must include the `dyn` keyword
-  --> $DIR/suggest-blanket-impl-local-trait.rs:53:35
-   |
-LL | impl<T, E> GenericTraitTwo<E> for GenericTrait<T> {}
-   |                                   ^^^^^^^^^^^^^^^
-   |
-help: add `dyn` keyword before this trait
-   |
-LL | impl<T, E> GenericTraitTwo<E> for dyn GenericTrait<T> {}
-   |                                   +++
-help: alternatively use a blanket implementation to implement `GenericTraitTwo<E>` for all types that also implement `GenericTrait<T>`
-   |
-LL | impl<T, E, U: GenericTrait<T>> GenericTraitTwo<E> for U {}
-   |          ++++++++++++++++++++                         ~
-
-error: aborting due to 7 previous errors
-
-For more information about this error, try `rustc --explain E0782`.
-- 
cgit v1.2.3