Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 97 deletions

diff --git a/src/test/ui/fn/fn-item-type.stderr b/src/test/ui/fn/fn-item-type.stderr
deleted file mode 100644
index f03a47d5c..000000000
--- a/src/test/ui/fn/fn-item-type.stderr
+++ /dev/null
@@ -1,97 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/fn-item-type.rs:13:19
-   |
-LL |     eq(foo::<u8>, bar::<u8>);
-   |     --            ^^^^^^^^^ expected fn item, found a different fn item
-   |     |
-   |     arguments to this function are incorrect
-   |
-   = note: expected fn item `fn(_) -> _ {foo::<u8>}`
-              found fn item `fn(_) -> _ {bar::<u8>}`
-   = note: different `fn` items always have unique types, even if their signatures are the same
-   = help: change the expected type to be function pointer `fn(isize) -> isize`
-   = help: if the expected type is due to type inference, cast the expected `fn` to a function pointer: `foo::<u8> as fn(isize) -> isize`
-note: function defined here
-  --> $DIR/fn-item-type.rs:7:4
-   |
-LL | fn eq<T>(x: T, y: T) { }
-   |    ^^          ----
-
-error[E0308]: mismatched types
-  --> $DIR/fn-item-type.rs:22:19
-   |
-LL |     eq(foo::<u8>, foo::<i8>);
-   |     --            ^^^^^^^^^ expected `u8`, found `i8`
-   |     |
-   |     arguments to this function are incorrect
-   |
-   = note: expected fn item `fn(_) -> _ {foo::<u8>}`
-              found fn item `fn(_) -> _ {foo::<i8>}`
-   = note: different `fn` items always have unique types, even if their signatures are the same
-   = help: change the expected type to be function pointer `fn(isize) -> isize`
-   = help: if the expected type is due to type inference, cast the expected `fn` to a function pointer: `foo::<u8> as fn(isize) -> isize`
-note: function defined here
-  --> $DIR/fn-item-type.rs:7:4
-   |
-LL | fn eq<T>(x: T, y: T) { }
-   |    ^^          ----
-
-error[E0308]: mismatched types
-  --> $DIR/fn-item-type.rs:29:23
-   |
-LL |     eq(bar::<String>, bar::<Vec<u8>>);
-   |     --                ^^^^^^^^^^^^^^ expected struct `String`, found struct `Vec`
-   |     |
-   |     arguments to this function are incorrect
-   |
-   = note: expected fn item `fn(_) -> _ {bar::<String>}`
-              found fn item `fn(_) -> _ {bar::<Vec<u8>>}`
-   = note: different `fn` items always have unique types, even if their signatures are the same
-   = help: change the expected type to be function pointer `fn(isize) -> isize`
-   = help: if the expected type is due to type inference, cast the expected `fn` to a function pointer: `bar::<String> as fn(isize) -> isize`
-note: function defined here
-  --> $DIR/fn-item-type.rs:7:4
-   |
-LL | fn eq<T>(x: T, y: T) { }
-   |    ^^          ----
-
-error[E0308]: mismatched types
-  --> $DIR/fn-item-type.rs:38:26
-   |
-LL |     eq(<u8 as Foo>::foo, <u16 as Foo>::foo);
-   |     --                   ^^^^^^^^^^^^^^^^^ expected `u8`, found `u16`
-   |     |
-   |     arguments to this function are incorrect
-   |
-   = note: expected fn item `fn() {<u8 as Foo>::foo}`
-              found fn item `fn() {<u16 as Foo>::foo}`
-   = note: different `fn` items always have unique types, even if their signatures are the same
-   = help: change the expected type to be function pointer `fn()`
-   = help: if the expected type is due to type inference, cast the expected `fn` to a function pointer: `<u8 as Foo>::foo as fn()`
-note: function defined here
-  --> $DIR/fn-item-type.rs:7:4
-   |
-LL | fn eq<T>(x: T, y: T) { }
-   |    ^^          ----
-
-error[E0308]: mismatched types
-  --> $DIR/fn-item-type.rs:45:19
-   |
-LL |     eq(foo::<u8>, bar::<u8> as fn(isize) -> isize);
-   |     --            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn item, found fn pointer
-   |     |
-   |     arguments to this function are incorrect
-   |
-   = note: expected fn item `fn(_) -> _ {foo::<u8>}`
-           found fn pointer `fn(_) -> _`
-   = help: change the expected type to be function pointer `fn(isize) -> isize`
-   = help: if the expected type is due to type inference, cast the expected `fn` to a function pointer: `foo::<u8> as fn(isize) -> isize`
-note: function defined here
-  --> $DIR/fn-item-type.rs:7:4
-   |
-LL | fn eq<T>(x: T, y: T) { }
-   |    ^^          ----
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0308`.