Rollup merge of #92849 - flip1995:clippyup, r=Manishearth

[rust.git] / tests / ui / absurd-extreme-comparisons.rs

diff --git a/tests/ui/absurd-extreme-comparisons.rs b/tests/ui/absurd-extreme-comparisons.rs
index 495dd27bb2bcfd60ab4273e8942fc25523308e53..d205b383d1ff64c745e1dd5b2842c22a1f66b570 100644 (file)
--- a/tests/ui/absurd-extreme-comparisons.rs
+++ b/tests/ui/absurd-extreme-comparisons.rs
@@ -1,74 +1,37 @@
-#![feature(plugin)]
-#![plugin(clippy)]
-
-#![deny(absurd_extreme_comparisons)]
-#![allow(unused, eq_op, no_effect, unnecessary_operation)]
-
+#![warn(clippy::absurd_extreme_comparisons)]
+#![allow(
+    unused,
+    clippy::eq_op,
+    clippy::no_effect,
+    clippy::unnecessary_operation,
+    clippy::needless_pass_by_value
+)]
+
+#[rustfmt::skip]
 fn main() {
     const Z: u32 = 0;
-
     let u: u32 = 42;
-
     u <= 0;
-
-
     u <= Z;
-
-
     u < Z;
-
-
     Z >= u;
-
-
     Z > u;
-
-
-    u > std::u32::MAX;
-
-
-    u >= std::u32::MAX;
-
-
-    std::u32::MAX < u;
-
-
-    std::u32::MAX <= u;
-
-
-
+    u > u32::MAX;
+    u >= u32::MAX;
+    u32::MAX < u;
+    u32::MAX <= u;
     1-1 > u;
-
-
     u >= !0;
-
-
     u <= 12 - 2*6;
-
-
-
     let i: i8 = 0;
     i < -127 - 1;
-
-
-    std::i8::MAX >= i;
-
-
-    3-7 < std::i32::MIN;
-
-
-
+    i8::MAX >= i;
+    3-7 < i32::MIN;
     let b = false;
     b >= true;
-
-
     false > b;
-
-
-
     u > 0; // ok
-
-    // this is handled by unit_cmp
+    // this is handled by clippy::unit_cmp
     () < {};
 }
 
@@ -79,15 +42,20 @@ fn main() {
 
 impl PartialEq<u32> for U {
     fn eq(&self, other: &u32) -> bool {
-        self.eq(&U(*other as u64))
+        self.eq(&U(u64::from(*other)))
     }
 }
 impl PartialOrd<u32> for U {
     fn partial_cmp(&self, other: &u32) -> Option<Ordering> {
-        self.partial_cmp(&U(*other as u64))
+        self.partial_cmp(&U(u64::from(*other)))
     }
 }
 
 pub fn foo(val: U) -> bool {
-    val > std::u32::MAX
+    val > u32::MAX
+}
+
+pub fn bar(len: u64) -> bool {
+    // This is OK as we are casting from target sized to fixed size
+    len >= usize::MAX as u64
 }