Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 85 deletions

diff --git a/src/test/ui/traits/test-2.stderr b/src/test/ui/traits/test-2.stderr
deleted file mode 100644
index eaa20b0b4..000000000
--- a/src/test/ui/traits/test-2.stderr
+++ /dev/null
@@ -1,85 +0,0 @@
-error[E0107]: this associated function takes 0 generic arguments but 1 generic argument was supplied
-  --> $DIR/test-2.rs:9:8
-   |
-LL |     10.dup::<i32>();
-   |        ^^^------- help: remove these generics
-   |        |
-   |        expected 0 generic arguments
-   |
-note: associated function defined here, with 0 generic parameters
-  --> $DIR/test-2.rs:4:16
-   |
-LL | trait bar { fn dup(&self) -> Self; fn blah<X>(&self); }
-   |                ^^^
-
-error[E0107]: this associated function takes 1 generic argument but 2 generic arguments were supplied
-  --> $DIR/test-2.rs:11:8
-   |
-LL |     10.blah::<i32, i32>();
-   |        ^^^^        --- help: remove this generic argument
-   |        |
-   |        expected 1 generic argument
-   |
-note: associated function defined here, with 1 generic parameter: `X`
-  --> $DIR/test-2.rs:4:39
-   |
-LL | trait bar { fn dup(&self) -> Self; fn blah<X>(&self); }
-   |                                       ^^^^ -
-
-error[E0038]: the trait `bar` cannot be made into an object
-  --> $DIR/test-2.rs:13:22
-   |
-LL |     (Box::new(10) as Box<dyn bar>).dup();
-   |                      ^^^^^^^^^^^^ `bar` cannot be made into an object
-   |
-note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
-  --> $DIR/test-2.rs:4:30
-   |
-LL | trait bar { fn dup(&self) -> Self; fn blah<X>(&self); }
-   |       ---                    ^^^^     ^^^^ ...because method `blah` has generic type parameters
-   |       |                      |
-   |       |                      ...because method `dup` references the `Self` type in its return type
-   |       this trait cannot be made into an object...
-   = help: consider moving `dup` to another trait
-   = help: consider moving `blah` to another trait
-
-error[E0038]: the trait `bar` cannot be made into an object
-  --> $DIR/test-2.rs:13:5
-   |
-LL |     (Box::new(10) as Box<dyn bar>).dup();
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `bar` cannot be made into an object
-   |
-note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
-  --> $DIR/test-2.rs:4:30
-   |
-LL | trait bar { fn dup(&self) -> Self; fn blah<X>(&self); }
-   |       ---                    ^^^^     ^^^^ ...because method `blah` has generic type parameters
-   |       |                      |
-   |       |                      ...because method `dup` references the `Self` type in its return type
-   |       this trait cannot be made into an object...
-   = help: consider moving `dup` to another trait
-   = help: consider moving `blah` to another trait
-
-error[E0038]: the trait `bar` cannot be made into an object
-  --> $DIR/test-2.rs:13:6
-   |
-LL |     (Box::new(10) as Box<dyn bar>).dup();
-   |      ^^^^^^^^^^^^ `bar` cannot be made into an object
-   |
-note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety>
-  --> $DIR/test-2.rs:4:30
-   |
-LL | trait bar { fn dup(&self) -> Self; fn blah<X>(&self); }
-   |       ---                    ^^^^     ^^^^ ...because method `blah` has generic type parameters
-   |       |                      |
-   |       |                      ...because method `dup` references the `Self` type in its return type
-   |       this trait cannot be made into an object...
-   = help: consider moving `dup` to another trait
-   = help: consider moving `blah` to another trait
-   = note: required for `Box<{integer}>` to implement `CoerceUnsized<Box<dyn bar>>`
-   = note: required by cast to type `Box<dyn bar>`
-
-error: aborting due to 5 previous errors
-
-Some errors have detailed explanations: E0038, E0107.
-For more information about an error, try `rustc --explain E0038`.