Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 53 deletions

diff --git a/src/test/ui/numbers-arithmetic/not-suggest-float-literal.rs b/src/test/ui/numbers-arithmetic/not-suggest-float-literal.rs
deleted file mode 100644
index 513d02db9..000000000
--- a/src/test/ui/numbers-arithmetic/not-suggest-float-literal.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-fn add_float_to_integer(x: u8) -> f32 {
-    x + 100.0 //~ ERROR cannot add `{float}` to `u8`
-}
-
-fn add_str_to_float(x: f64) -> f64 {
-    x + "foo" //~ ERROR cannot add `&str` to `f64`
-}
-
-fn add_lvar_to_float(x: f64) -> f64 {
-    let y = 3;
-    x + y //~ ERROR cannot add `{integer}` to `f64`
-}
-
-fn subtract_float_from_integer(x: u8) -> f32 {
-    x - 100.0 //~ ERROR cannot subtract `{float}` from `u8`
-}
-
-fn subtract_str_from_f64(x: f64) -> f64 {
-    x - "foo" //~ ERROR cannot subtract `&str` from `f64`
-}
-
-fn subtract_lvar_from_f64(x: f64) -> f64 {
-    let y = 3;
-    x - y //~ ERROR cannot subtract `{integer}` from `f64`
-}
-
-fn multiply_integer_by_float(x: u8) -> f32 {
-    x * 100.0 //~ ERROR cannot multiply `u8` by `{float}`
-}
-
-fn multiply_f64_by_str(x: f64) -> f64 {
-    x * "foo" //~ ERROR cannot multiply `f64` by `&str`
-}
-
-fn multiply_f64_by_lvar(x: f64) -> f64 {
-    let y = 3;
-    x * y //~ ERROR cannot multiply `f64` by `{integer}`
-}
-
-fn divide_integer_by_float(x: u8) -> u8 {
-    x / 100.0 //~ ERROR cannot divide `u8` by `{float}`
-}
-
-fn divide_f64_by_str(x: f64) -> f64 {
-    x / "foo" //~ ERROR cannot divide `f64` by `&str`
-}
-
-fn divide_f64_by_lvar(x: f64) -> f64 {
-    let y = 3;
-    x / y //~ ERROR cannot divide `f64` by `{integer}`
-}
-
-fn main() {}