Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 186 deletions

diff --git a/src/test/ui/traits/suggest-fully-qualified-path-with-adjustment.stderr b/src/test/ui/traits/suggest-fully-qualified-path-with-adjustment.stderr
deleted file mode 100644
index 68b31a1ca..000000000
--- a/src/test/ui/traits/suggest-fully-qualified-path-with-adjustment.stderr
+++ /dev/null
@@ -1,186 +0,0 @@
-error[E0282]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:45:11
-   |
-LL |     thing.method();
-   |           ^^^^^^
-   |
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <Thing as Method<T>>::method(&thing);
-   |     ++++++++++++++++++++++++++++++     ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:45:11
-   |
-LL |     thing.method();
-   |           ^^^^^^
-   |
-note: multiple `impl`s satisfying `Thing: Method<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:10:1
-   |
-LL | impl Method<i32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl Method<u32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <Thing as Method<T>>::method(&thing);
-   |     ++++++++++++++++++++++++++++++     ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:48:11
-   |
-LL |     thing.mut_method();
-   |           ^^^^^^^^^^
-   |
-note: multiple `impl`s satisfying `Thing: Method<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:10:1
-   |
-LL | impl Method<i32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl Method<u32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <Thing as Method<T>>::mut_method(&mut thing);
-   |     +++++++++++++++++++++++++++++++++++++      ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:49:11
-   |
-LL |     thing.by_self();
-   |           ^^^^^^^
-   |
-note: multiple `impl`s satisfying `&Thing: MethodRef<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:22:1
-   |
-LL | impl MethodRef<i32> for &Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl MethodRef<u32> for &Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <&Thing as MethodRef<T>>::by_self(&thing);
-   |     +++++++++++++++++++++++++++++++++++     ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:52:14
-   |
-LL |     deref_to.method();
-   |              ^^^^^^
-   |
-note: multiple `impl`s satisfying `Thing: Method<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:10:1
-   |
-LL | impl Method<i32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl Method<u32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <Thing as Method<T>>::method(&deref_to);
-   |     ++++++++++++++++++++++++++++++        ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:53:14
-   |
-LL |     deref_to.mut_method();
-   |              ^^^^^^^^^^
-   |
-note: multiple `impl`s satisfying `Thing: Method<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:10:1
-   |
-LL | impl Method<i32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl Method<u32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <Thing as Method<T>>::mut_method(&mut deref_to);
-   |     +++++++++++++++++++++++++++++++++++++         ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:54:14
-   |
-LL |     deref_to.by_self();
-   |              ^^^^^^^
-   |
-note: multiple `impl`s satisfying `&Thing: MethodRef<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:22:1
-   |
-LL | impl MethodRef<i32> for &Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl MethodRef<u32> for &Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <&Thing as MethodRef<T>>::by_self(&deref_to);
-   |     +++++++++++++++++++++++++++++++++++        ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:57:20
-   |
-LL |     deref_deref_to.method();
-   |                    ^^^^^^
-   |
-note: multiple `impl`s satisfying `Thing: Method<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:10:1
-   |
-LL | impl Method<i32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl Method<u32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <Thing as Method<T>>::method(&deref_deref_to);
-   |     ++++++++++++++++++++++++++++++              ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:58:20
-   |
-LL |     deref_deref_to.mut_method();
-   |                    ^^^^^^^^^^
-   |
-note: multiple `impl`s satisfying `Thing: Method<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:10:1
-   |
-LL | impl Method<i32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl Method<u32> for Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <Thing as Method<T>>::mut_method(&mut deref_deref_to);
-   |     +++++++++++++++++++++++++++++++++++++               ~
-
-error[E0283]: type annotations needed
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:59:20
-   |
-LL |     deref_deref_to.by_self();
-   |                    ^^^^^^^
-   |
-note: multiple `impl`s satisfying `&Thing: MethodRef<_>` found
-  --> $DIR/suggest-fully-qualified-path-with-adjustment.rs:22:1
-   |
-LL | impl MethodRef<i32> for &Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-...
-LL | impl MethodRef<u32> for &Thing {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-help: try using a fully qualified path to specify the expected types
-   |
-LL |     <&Thing as MethodRef<T>>::by_self(&deref_deref_to);
-   |     +++++++++++++++++++++++++++++++++++              ~
-
-error: aborting due to 10 previous errors
-
-Some errors have detailed explanations: E0282, E0283.
-For more information about an error, try `rustc --explain E0282`.