From dc8c7b16775be6c249555338af70d78013f01301 Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Mon, 28 Jan 2019 10:10:27 +0100 Subject: [PATCH] Atomics constants are now handled by the deprecation lint --- clippy_lints/src/replace_consts.rs | 15 ---- tests/ui/replace_consts.fixed | 12 --- tests/ui/replace_consts.rs | 12 --- tests/ui/replace_consts.stderr | 120 +++++++---------------------- 4 files changed, 27 insertions(+), 132 deletions(-) diff --git a/clippy_lints/src/replace_consts.rs b/clippy_lints/src/replace_consts.rs index 16c8cc3bc47..47168445ad3 100644 --- a/clippy_lints/src/replace_consts.rs +++ b/clippy_lints/src/replace_consts.rs @@ -69,21 +69,6 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ReplaceConsts { const REPLACEMENTS: &[(&[&str], &str)] = &[ // Once (&["core", "sync", "ONCE_INIT"], "Once::new()"), - // Atomic - ( - &["core", "sync", "atomic", "ATOMIC_BOOL_INIT"], - "AtomicBool::new(false)", - ), - (&["core", "sync", "atomic", "ATOMIC_ISIZE_INIT"], "AtomicIsize::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_I8_INIT"], "AtomicI8::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_I16_INIT"], "AtomicI16::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_I32_INIT"], "AtomicI32::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_I64_INIT"], "AtomicI64::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_USIZE_INIT"], "AtomicUsize::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_U8_INIT"], "AtomicU8::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_U16_INIT"], "AtomicU16::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_U32_INIT"], "AtomicU32::new(0)"), - (&["core", "sync", "atomic", "ATOMIC_U64_INIT"], "AtomicU64::new(0)"), // Min (&["core", "isize", "MIN"], "isize::min_value()"), (&["core", "i8", "MIN"], "i8::min_value()"), diff --git a/tests/ui/replace_consts.fixed b/tests/ui/replace_consts.fixed index 96a1281e478..2c125f978d9 100644 --- a/tests/ui/replace_consts.fixed +++ b/tests/ui/replace_consts.fixed @@ -10,18 +10,6 @@ use std::sync::{Once, ONCE_INIT}; fn bad() { // Once { let foo = ONCE_INIT; }; - // Atomic - { let foo = AtomicBool::new(false); }; - { let foo = AtomicIsize::new(0); }; - { let foo = AtomicI8::new(0); }; - { let foo = AtomicI16::new(0); }; - { let foo = AtomicI32::new(0); }; - { let foo = AtomicI64::new(0); }; - { let foo = AtomicUsize::new(0); }; - { let foo = AtomicU8::new(0); }; - { let foo = AtomicU16::new(0); }; - { let foo = AtomicU32::new(0); }; - { let foo = AtomicU64::new(0); }; // Min { let foo = isize::min_value(); }; { let foo = i8::min_value(); }; diff --git a/tests/ui/replace_consts.rs b/tests/ui/replace_consts.rs index b61293cc6e9..3c7d8d07ed6 100644 --- a/tests/ui/replace_consts.rs +++ b/tests/ui/replace_consts.rs @@ -10,18 +10,6 @@ use std::sync::{Once, ONCE_INIT}; fn bad() { // Once { let foo = ONCE_INIT; }; - // Atomic - { let foo = ATOMIC_BOOL_INIT; }; - { let foo = ATOMIC_ISIZE_INIT; }; - { let foo = ATOMIC_I8_INIT; }; - { let foo = ATOMIC_I16_INIT; }; - { let foo = ATOMIC_I32_INIT; }; - { let foo = ATOMIC_I64_INIT; }; - { let foo = ATOMIC_USIZE_INIT; }; - { let foo = ATOMIC_U8_INIT; }; - { let foo = ATOMIC_U16_INIT; }; - { let foo = ATOMIC_U32_INIT; }; - { let foo = ATOMIC_U64_INIT; }; // Min { let foo = std::isize::MIN; }; { let foo = std::i8::MIN; }; diff --git a/tests/ui/replace_consts.stderr b/tests/ui/replace_consts.stderr index 6f2155406cd..be0d0072623 100644 --- a/tests/ui/replace_consts.stderr +++ b/tests/ui/replace_consts.stderr @@ -1,8 +1,8 @@ -error: using `ATOMIC_BOOL_INIT` +error: using `MIN` --> $DIR/replace_consts.rs:14:17 | -LL | { let foo = ATOMIC_BOOL_INIT; }; - | ^^^^^^^^^^^^^^^^ help: try this: `AtomicBool::new(false)` +LL | { let foo = std::isize::MIN; }; + | ^^^^^^^^^^^^^^^ help: try this: `isize::min_value()` | note: lint level defined here --> $DIR/replace_consts.rs:4:9 @@ -10,209 +10,143 @@ note: lint level defined here LL | #![deny(clippy::replace_consts)] | ^^^^^^^^^^^^^^^^^^^^^^ -error: using `ATOMIC_ISIZE_INIT` +error: using `MIN` --> $DIR/replace_consts.rs:15:17 | -LL | { let foo = ATOMIC_ISIZE_INIT; }; - | ^^^^^^^^^^^^^^^^^ help: try this: `AtomicIsize::new(0)` - -error: using `ATOMIC_I8_INIT` - --> $DIR/replace_consts.rs:16:17 - | -LL | { let foo = ATOMIC_I8_INIT; }; - | ^^^^^^^^^^^^^^ help: try this: `AtomicI8::new(0)` - -error: using `ATOMIC_I16_INIT` - --> $DIR/replace_consts.rs:17:17 - | -LL | { let foo = ATOMIC_I16_INIT; }; - | ^^^^^^^^^^^^^^^ help: try this: `AtomicI16::new(0)` - -error: using `ATOMIC_I32_INIT` - --> $DIR/replace_consts.rs:18:17 - | -LL | { let foo = ATOMIC_I32_INIT; }; - | ^^^^^^^^^^^^^^^ help: try this: `AtomicI32::new(0)` - -error: using `ATOMIC_I64_INIT` - --> $DIR/replace_consts.rs:19:17 - | -LL | { let foo = ATOMIC_I64_INIT; }; - | ^^^^^^^^^^^^^^^ help: try this: `AtomicI64::new(0)` - -error: using `ATOMIC_USIZE_INIT` - --> $DIR/replace_consts.rs:20:17 - | -LL | { let foo = ATOMIC_USIZE_INIT; }; - | ^^^^^^^^^^^^^^^^^ help: try this: `AtomicUsize::new(0)` - -error: using `ATOMIC_U8_INIT` - --> $DIR/replace_consts.rs:21:17 - | -LL | { let foo = ATOMIC_U8_INIT; }; - | ^^^^^^^^^^^^^^ help: try this: `AtomicU8::new(0)` - -error: using `ATOMIC_U16_INIT` - --> $DIR/replace_consts.rs:22:17 - | -LL | { let foo = ATOMIC_U16_INIT; }; - | ^^^^^^^^^^^^^^^ help: try this: `AtomicU16::new(0)` - -error: using `ATOMIC_U32_INIT` - --> $DIR/replace_consts.rs:23:17 - | -LL | { let foo = ATOMIC_U32_INIT; }; - | ^^^^^^^^^^^^^^^ help: try this: `AtomicU32::new(0)` - -error: using `ATOMIC_U64_INIT` - --> $DIR/replace_consts.rs:24:17 - | -LL | { let foo = ATOMIC_U64_INIT; }; - | ^^^^^^^^^^^^^^^ help: try this: `AtomicU64::new(0)` - -error: using `MIN` - --> $DIR/replace_consts.rs:26:17 - | -LL | { let foo = std::isize::MIN; }; - | ^^^^^^^^^^^^^^^ help: try this: `isize::min_value()` - -error: using `MIN` - --> $DIR/replace_consts.rs:27:17 - | LL | { let foo = std::i8::MIN; }; | ^^^^^^^^^^^^ help: try this: `i8::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:28:17 + --> $DIR/replace_consts.rs:16:17 | LL | { let foo = std::i16::MIN; }; | ^^^^^^^^^^^^^ help: try this: `i16::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:29:17 + --> $DIR/replace_consts.rs:17:17 | LL | { let foo = std::i32::MIN; }; | ^^^^^^^^^^^^^ help: try this: `i32::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:30:17 + --> $DIR/replace_consts.rs:18:17 | LL | { let foo = std::i64::MIN; }; | ^^^^^^^^^^^^^ help: try this: `i64::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:31:17 + --> $DIR/replace_consts.rs:19:17 | LL | { let foo = std::i128::MIN; }; | ^^^^^^^^^^^^^^ help: try this: `i128::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:32:17 + --> $DIR/replace_consts.rs:20:17 | LL | { let foo = std::usize::MIN; }; | ^^^^^^^^^^^^^^^ help: try this: `usize::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:33:17 + --> $DIR/replace_consts.rs:21:17 | LL | { let foo = std::u8::MIN; }; | ^^^^^^^^^^^^ help: try this: `u8::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:34:17 + --> $DIR/replace_consts.rs:22:17 | LL | { let foo = std::u16::MIN; }; | ^^^^^^^^^^^^^ help: try this: `u16::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:35:17 + --> $DIR/replace_consts.rs:23:17 | LL | { let foo = std::u32::MIN; }; | ^^^^^^^^^^^^^ help: try this: `u32::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:36:17 + --> $DIR/replace_consts.rs:24:17 | LL | { let foo = std::u64::MIN; }; | ^^^^^^^^^^^^^ help: try this: `u64::min_value()` error: using `MIN` - --> $DIR/replace_consts.rs:37:17 + --> $DIR/replace_consts.rs:25:17 | LL | { let foo = std::u128::MIN; }; | ^^^^^^^^^^^^^^ help: try this: `u128::min_value()` error: using `MAX` - --> $DIR/replace_consts.rs:39:17 + --> $DIR/replace_consts.rs:27:17 | LL | { let foo = std::isize::MAX; }; | ^^^^^^^^^^^^^^^ help: try this: `isize::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:40:17 + --> $DIR/replace_consts.rs:28:17 | LL | { let foo = std::i8::MAX; }; | ^^^^^^^^^^^^ help: try this: `i8::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:41:17 + --> $DIR/replace_consts.rs:29:17 | LL | { let foo = std::i16::MAX; }; | ^^^^^^^^^^^^^ help: try this: `i16::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:42:17 + --> $DIR/replace_consts.rs:30:17 | LL | { let foo = std::i32::MAX; }; | ^^^^^^^^^^^^^ help: try this: `i32::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:43:17 + --> $DIR/replace_consts.rs:31:17 | LL | { let foo = std::i64::MAX; }; | ^^^^^^^^^^^^^ help: try this: `i64::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:44:17 + --> $DIR/replace_consts.rs:32:17 | LL | { let foo = std::i128::MAX; }; | ^^^^^^^^^^^^^^ help: try this: `i128::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:45:17 + --> $DIR/replace_consts.rs:33:17 | LL | { let foo = std::usize::MAX; }; | ^^^^^^^^^^^^^^^ help: try this: `usize::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:46:17 + --> $DIR/replace_consts.rs:34:17 | LL | { let foo = std::u8::MAX; }; | ^^^^^^^^^^^^ help: try this: `u8::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:47:17 + --> $DIR/replace_consts.rs:35:17 | LL | { let foo = std::u16::MAX; }; | ^^^^^^^^^^^^^ help: try this: `u16::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:48:17 + --> $DIR/replace_consts.rs:36:17 | LL | { let foo = std::u32::MAX; }; | ^^^^^^^^^^^^^ help: try this: `u32::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:49:17 + --> $DIR/replace_consts.rs:37:17 | LL | { let foo = std::u64::MAX; }; | ^^^^^^^^^^^^^ help: try this: `u64::max_value()` error: using `MAX` - --> $DIR/replace_consts.rs:50:17 + --> $DIR/replace_consts.rs:38:17 | LL | { let foo = std::u128::MAX; }; | ^^^^^^^^^^^^^^ help: try this: `u128::max_value()` -error: aborting due to 35 previous errors +error: aborting due to 24 previous errors