Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 102 deletions

diff --git a/src/test/ui/traits/suggest-where-clause.stderr b/src/test/ui/traits/suggest-where-clause.stderr
deleted file mode 100644
index 747e2477b..000000000
--- a/src/test/ui/traits/suggest-where-clause.stderr
+++ /dev/null
@@ -1,102 +0,0 @@
-error[E0277]: the size for values of type `U` cannot be known at compilation time
-  --> $DIR/suggest-where-clause.rs:7:20
-   |
-LL | fn check<T: Iterator, U: ?Sized>() {
-   |                       - this type parameter needs to be `std::marker::Sized`
-LL |     // suggest a where-clause, if needed
-LL |     mem::size_of::<U>();
-   |                    ^ doesn't have a size known at compile-time
-   |
-note: required by a bound in `std::mem::size_of`
-  --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
-help: consider removing the `?Sized` bound to make the type parameter `Sized`
-   |
-LL - fn check<T: Iterator, U: ?Sized>() {
-LL + fn check<T: Iterator, U>() {
-   |
-
-error[E0277]: the size for values of type `U` cannot be known at compilation time
-  --> $DIR/suggest-where-clause.rs:10:20
-   |
-LL | fn check<T: Iterator, U: ?Sized>() {
-   |                       - this type parameter needs to be `std::marker::Sized`
-...
-LL |     mem::size_of::<Misc<U>>();
-   |                    ^^^^^^^ doesn't have a size known at compile-time
-   |
-note: required because it appears within the type `Misc<U>`
-  --> $DIR/suggest-where-clause.rs:3:8
-   |
-LL | struct Misc<T:?Sized>(T);
-   |        ^^^^
-note: required by a bound in `std::mem::size_of`
-  --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
-help: consider removing the `?Sized` bound to make the type parameter `Sized`
-   |
-LL - fn check<T: Iterator, U: ?Sized>() {
-LL + fn check<T: Iterator, U>() {
-   |
-
-error[E0277]: the trait bound `u64: From<T>` is not satisfied
-  --> $DIR/suggest-where-clause.rs:15:5
-   |
-LL |     <u64 as From<T>>::from;
-   |     ^^^^^^^^^^^^^^^^^^^^^^ the trait `From<T>` is not implemented for `u64`
-   |
-help: consider introducing a `where` clause, but there might be an alternative better way to express this requirement
-   |
-LL | fn check<T: Iterator, U: ?Sized>() where u64: From<T> {
-   |                                    ++++++++++++++++++
-
-error[E0277]: the trait bound `u64: From<<T as Iterator>::Item>` is not satisfied
-  --> $DIR/suggest-where-clause.rs:18:5
-   |
-LL |     <u64 as From<<T as Iterator>::Item>>::from;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<<T as Iterator>::Item>` is not implemented for `u64`
-   |
-help: consider introducing a `where` clause, but there might be an alternative better way to express this requirement
-   |
-LL | fn check<T: Iterator, U: ?Sized>() where u64: From<<T as Iterator>::Item> {
-   |                                    ++++++++++++++++++++++++++++++++++++++
-
-error[E0277]: the trait bound `Misc<_>: From<T>` is not satisfied
-  --> $DIR/suggest-where-clause.rs:23:5
-   |
-LL |     <Misc<_> as From<T>>::from;
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<T>` is not implemented for `Misc<_>`
-
-error[E0277]: the size for values of type `[T]` cannot be known at compilation time
-  --> $DIR/suggest-where-clause.rs:28:20
-   |
-LL |     mem::size_of::<[T]>();
-   |                    ^^^ doesn't have a size known at compile-time
-   |
-   = help: the trait `Sized` is not implemented for `[T]`
-note: required by a bound in `std::mem::size_of`
-  --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
-
-error[E0277]: the size for values of type `[&U]` cannot be known at compilation time
-  --> $DIR/suggest-where-clause.rs:31:20
-   |
-LL |     mem::size_of::<[&U]>();
-   |                    ^^^^ doesn't have a size known at compile-time
-   |
-   = help: the trait `Sized` is not implemented for `[&U]`
-note: required by a bound in `std::mem::size_of`
-  --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |                      ^ required by this bound in `std::mem::size_of`
-
-error: aborting due to 7 previous errors
-
-For more information about this error, try `rustc --explain E0277`.