Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 201 deletions

diff --git a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr b/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr
deleted file mode 100644
index d966893a8..000000000
--- a/src/test/ui/numeric/numeric-suffix/numeric-suffix-u32.stderr
+++ /dev/null
@@ -1,201 +0,0 @@
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:28:16
-   |
-LL |     foo::<u32>(42_usize);
-   |     ---------- ^^^^^^^^ expected `u32`, found `usize`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `usize` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:32:16
-   |
-LL |     foo::<u32>(42_u64);
-   |     ---------- ^^^^^^ expected `u32`, found `u64`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `u64` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:37:16
-   |
-LL |     foo::<u32>(42_u16);
-   |     ---------- ^^^^^^ expected `u32`, found `u16`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `u16` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:41:16
-   |
-LL |     foo::<u32>(42_u8);
-   |     ---------- ^^^^^ expected `u32`, found `u8`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `u8` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:45:16
-   |
-LL |     foo::<u32>(42_isize);
-   |     ---------- ^^^^^^^^ expected `u32`, found `isize`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `isize` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:49:16
-   |
-LL |     foo::<u32>(42_i64);
-   |     ---------- ^^^^^^ expected `u32`, found `i64`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `i64` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:53:16
-   |
-LL |     foo::<u32>(42_i32);
-   |     ---------- ^^^^^^ expected `u32`, found `i32`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `i32` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:57:16
-   |
-LL |     foo::<u32>(42_i16);
-   |     ---------- ^^^^^^ expected `u32`, found `i16`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `i16` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:61:16
-   |
-LL |     foo::<u32>(42_i8);
-   |     ---------- ^^^^^ expected `u32`, found `i8`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `i8` to `u32`
-   |
-LL |     foo::<u32>(42_u32);
-   |                   ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:65:16
-   |
-LL |     foo::<u32>(42.0_f64);
-   |     ---------- ^^^^^^^^ expected `u32`, found `f64`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `f64` to `u32`
-   |
-LL |     foo::<u32>(42u32);
-   |                  ~~~
-
-error[E0308]: mismatched types
-  --> $DIR/numeric-suffix-u32.rs:69:16
-   |
-LL |     foo::<u32>(42.0_f32);
-   |     ---------- ^^^^^^^^ expected `u32`, found `f32`
-   |     |
-   |     arguments to this function are incorrect
-   |
-note: function defined here
-  --> $DIR/numeric-suffix-u32.rs:3:4
-   |
-LL | fn foo<N>(_x: N) {}
-   |    ^^^    -----
-help: change the type of the numeric literal from `f32` to `u32`
-   |
-LL |     foo::<u32>(42u32);
-   |                  ~~~
-
-error: aborting due to 11 previous errors
-
-For more information about this error, try `rustc --explain E0308`.