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