diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ff1a55c8d9f..c45a05dd7891 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7251,6 +7251,7 @@ Released 2018-09-13 [`needless_lifetimes`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_lifetimes [`needless_match`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_match [`needless_maybe_sized`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_maybe_sized +[`needless_nonzero_get`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_nonzero_get [`needless_option_as_deref`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_option_as_deref [`needless_option_take`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_option_take [`needless_parens_on_range_literals`]: https://rust-lang.github.io/rust-clippy/master/index.html#needless_parens_on_range_literals @@ -7566,7 +7567,6 @@ Released 2018-09-13 [`unnecessary_map_or`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_map_or [`unnecessary_min_or_max`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_min_or_max [`unnecessary_mut_passed`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_mut_passed -[`unnecessary_nonzero_get`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_nonzero_get [`unnecessary_operation`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_operation [`unnecessary_option_map_or_else`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_option_map_or_else [`unnecessary_owned_empty_strings`]: https://rust-lang.github.io/rust-clippy/master/index.html#unnecessary_owned_empty_strings diff --git a/clippy_lints/src/declared_lints.rs b/clippy_lints/src/declared_lints.rs index 18e81b84e271..5fd28aae0bee 100644 --- a/clippy_lints/src/declared_lints.rs +++ b/clippy_lints/src/declared_lints.rs @@ -572,6 +572,7 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[ crate::needless_ifs::NEEDLESS_IFS_INFO, crate::needless_late_init::NEEDLESS_LATE_INIT_INFO, crate::needless_maybe_sized::NEEDLESS_MAYBE_SIZED_INFO, + crate::needless_nonzero_get::NEEDLESS_NONZERO_GET_INFO, crate::needless_parens_on_range_literals::NEEDLESS_PARENS_ON_RANGE_LITERALS_INFO, crate::needless_pass_by_ref_mut::NEEDLESS_PASS_BY_REF_MUT_INFO, crate::needless_pass_by_value::NEEDLESS_PASS_BY_VALUE_INFO, @@ -787,7 +788,6 @@ pub static LINTS: &[&::declare_clippy_lint::LintInfo] = &[ crate::unnecessary_literal_bound::UNNECESSARY_LITERAL_BOUND_INFO, crate::unnecessary_map_on_constructor::UNNECESSARY_MAP_ON_CONSTRUCTOR_INFO, crate::unnecessary_mut_passed::UNNECESSARY_MUT_PASSED_INFO, - crate::unnecessary_nonzero_get::UNNECESSARY_NONZERO_GET_INFO, crate::unnecessary_owned_empty_strings::UNNECESSARY_OWNED_EMPTY_STRINGS_INFO, crate::unnecessary_self_imports::UNNECESSARY_SELF_IMPORTS_INFO, crate::unnecessary_semicolon::UNNECESSARY_SEMICOLON_INFO, diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 5fa7ec82d923..46f88a9b3a53 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -263,6 +263,7 @@ mod needless_for_each; mod needless_ifs; mod needless_late_init; mod needless_maybe_sized; +mod needless_nonzero_get; mod needless_parens_on_range_literals; mod needless_pass_by_ref_mut; mod needless_pass_by_value; @@ -378,7 +379,6 @@ mod unnecessary_box_returns; mod unnecessary_literal_bound; mod unnecessary_map_on_constructor; mod unnecessary_mut_passed; -mod unnecessary_nonzero_get; mod unnecessary_owned_empty_strings; mod unnecessary_self_imports; mod unnecessary_semicolon; @@ -868,7 +868,7 @@ rustc_lint::late_lint_methods!( RestWhenDestructuringStruct: rest_when_destructuring_struct::RestWhenDestructuringStruct = rest_when_destructuring_struct::RestWhenDestructuringStruct, BlockScrutinee: block_scrutinee::BlockScrutinee = block_scrutinee::BlockScrutinee, NonnullUncheckedOnBoxPtr: nonnull_unchecked_on_box_ptr::NonnullUncheckedOnBoxPtr = nonnull_unchecked_on_box_ptr::NonnullUncheckedOnBoxPtr::new(conf), - UnnecessaryNonzeroGet: unnecessary_nonzero_get::UnnecessaryNonzeroGet = unnecessary_nonzero_get::UnnecessaryNonzeroGet::new(conf), + NeedlessNonzeroGet: needless_nonzero_get::NeedlessNonzeroGet = needless_nonzero_get::NeedlessNonzeroGet::new(conf), // add late passes here, used by `cargo dev new_lint` ]] ); diff --git a/clippy_lints/src/unnecessary_nonzero_get.rs b/clippy_lints/src/needless_nonzero_get.rs similarity index 97% rename from clippy_lints/src/unnecessary_nonzero_get.rs rename to clippy_lints/src/needless_nonzero_get.rs index 9e1510927582..9823965bb055 100644 --- a/clippy_lints/src/unnecessary_nonzero_get.rs +++ b/clippy_lints/src/needless_nonzero_get.rs @@ -46,24 +46,24 @@ declare_clippy_lint! { /// let _ = 4 / nz; /// ``` #[clippy::version = "1.99.0"] - pub UNNECESSARY_NONZERO_GET, + pub NEEDLESS_NONZERO_GET, complexity, "unnecessary `NonZero::get` call" } -impl_lint_pass!(UnnecessaryNonzeroGet => [UNNECESSARY_NONZERO_GET]); +impl_lint_pass!(NeedlessNonzeroGet => [NEEDLESS_NONZERO_GET]); -pub struct UnnecessaryNonzeroGet { +pub struct NeedlessNonzeroGet { msrv: Msrv, } -impl UnnecessaryNonzeroGet { +impl NeedlessNonzeroGet { pub fn new(conf: &'static Conf) -> Self { Self { msrv: conf.msrv.into() } } } -impl<'tcx> LateLintPass<'tcx> for UnnecessaryNonzeroGet { +impl<'tcx> LateLintPass<'tcx> for NeedlessNonzeroGet { fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &Expr<'tcx>) { match expr.kind { // `.get().()` @@ -155,7 +155,7 @@ fn emit_unnecessary_get<'tcx>( span_lint_and_then( cx, - UNNECESSARY_NONZERO_GET, + NEEDLESS_NONZERO_GET, get_span, format!("unnecessary `get` before `{operation}`"), |diag| { diff --git a/tests/ui/unnecessary_nonzero_get.fixed b/tests/ui/needless_nonzero_get.fixed similarity index 83% rename from tests/ui/unnecessary_nonzero_get.fixed rename to tests/ui/needless_nonzero_get.fixed index f4a6391be383..4e64b735178d 100644 --- a/tests/ui/unnecessary_nonzero_get.fixed +++ b/tests/ui/needless_nonzero_get.fixed @@ -1,6 +1,6 @@ //@aux-build:proc_macros.rs -#![warn(clippy::unnecessary_nonzero_get)] +#![warn(clippy::needless_nonzero_get)] // the `msrv` functions below deliberately use items newer than their MSRV #![allow(clippy::incompatible_msrv)] @@ -11,83 +11,83 @@ use std::num::{NonZero, NonZeroI32, NonZeroU32}; fn unsigned(nz: NonZero) { let _ = nz.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.is_power_of_two(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.ilog2(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.ilog10(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn signed(nz: NonZero) { let _ = nz.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.is_positive(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.is_negative(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn unsigned_widths(a: NonZero, b: NonZero, c: NonZero, d: NonZero, e: NonZero) { let _ = a.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = b.trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = c.ilog2(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = d.is_power_of_two(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = e.ilog10(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn signed_widths(f: NonZero, g: NonZero, h: NonZero, i: NonZero, j: NonZero) { let _ = f.is_negative(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = g.is_positive(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = h.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = i.trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = j.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn aliases_and_receivers(a: NonZeroU32, b: NonZeroI32, r: &NonZero) { let _ = a.ilog2(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = b.is_positive(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = r.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get // more complex receiver expressions let _ = NonZero::new(5u32).unwrap().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = (a).trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get // multi-line chain let _ = a - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get .leading_zeros(); } fn operators(mut value: u32, other: u32, nz: NonZero) { let _ = other / nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = other % nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get value /= nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get value %= nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // The `NonZero` operator implementations carry `#[rustc_const_unstable(feature = "const_ops")]`, @@ -100,7 +100,7 @@ const fn const_operators(mut value: u32, nz: NonZero) -> u32 { // `NonZero::leading_zeros` is const-stable since 1.53.0, so the `get` can go even in a `const fn`. const fn const_methods(nz: NonZero) -> u32 { nz.leading_zeros() - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn no_lint(nz: NonZero, signed: NonZero, plain: u32) { @@ -181,7 +181,7 @@ fn below_msrv(nz: NonZero) { #[clippy::msrv = "1.53"] fn meets_msrv(nz: NonZero) { let _ = nz.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // `NonZero::ilog2` was stabilized in 1.67.0, later than `leading_zeros` @@ -189,7 +189,7 @@ fn meets_msrv(nz: NonZero) { fn below_ilog2_msrv(nz: NonZero) { let _ = nz.get().ilog2(); let _ = nz.leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // `Div>` and `Rem>` were stabilized in 1.51.0 @@ -202,9 +202,9 @@ fn below_nonzero_div_msrv(value: u32, nz: NonZero) { #[clippy::msrv = "1.51"] fn meets_nonzero_div_msrv(value: u32, nz: NonZero) { let _ = value / nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = value % nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // `DivAssign>` and `RemAssign>` were stabilized in 1.79.0 @@ -217,9 +217,9 @@ fn below_nonzero_div_assign_msrv(mut value: u32, nz: NonZero) { #[clippy::msrv = "1.79"] fn meets_nonzero_div_assign_msrv(mut value: u32, nz: NonZero) { value /= nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get value %= nz; - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // The whole expression is written in the macro, so the suggestion would point at code the caller diff --git a/tests/ui/unnecessary_nonzero_get.rs b/tests/ui/needless_nonzero_get.rs similarity index 83% rename from tests/ui/unnecessary_nonzero_get.rs rename to tests/ui/needless_nonzero_get.rs index 521381592ae3..4c7108af04dd 100644 --- a/tests/ui/unnecessary_nonzero_get.rs +++ b/tests/ui/needless_nonzero_get.rs @@ -1,6 +1,6 @@ //@aux-build:proc_macros.rs -#![warn(clippy::unnecessary_nonzero_get)] +#![warn(clippy::needless_nonzero_get)] // the `msrv` functions below deliberately use items newer than their MSRV #![allow(clippy::incompatible_msrv)] @@ -11,84 +11,84 @@ use std::num::{NonZero, NonZeroI32, NonZeroU32}; fn unsigned(nz: NonZero) { let _ = nz.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.get().trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.get().is_power_of_two(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.get().ilog2(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.get().ilog10(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn signed(nz: NonZero) { let _ = nz.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.get().trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.get().is_positive(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = nz.get().is_negative(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn unsigned_widths(a: NonZero, b: NonZero, c: NonZero, d: NonZero, e: NonZero) { let _ = a.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = b.get().trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = c.get().ilog2(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = d.get().is_power_of_two(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = e.get().ilog10(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn signed_widths(f: NonZero, g: NonZero, h: NonZero, i: NonZero, j: NonZero) { let _ = f.get().is_negative(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = g.get().is_positive(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = h.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = i.get().trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = j.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn aliases_and_receivers(a: NonZeroU32, b: NonZeroI32, r: &NonZero) { let _ = a.get().ilog2(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = b.get().is_positive(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = r.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get // more complex receiver expressions let _ = NonZero::new(5u32).unwrap().get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = (a).get().trailing_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get // multi-line chain let _ = a .get() - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get .leading_zeros(); } fn operators(mut value: u32, other: u32, nz: NonZero) { let _ = other / nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = other % nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get value /= nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get value %= nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // The `NonZero` operator implementations carry `#[rustc_const_unstable(feature = "const_ops")]`, @@ -101,7 +101,7 @@ const fn const_operators(mut value: u32, nz: NonZero) -> u32 { // `NonZero::leading_zeros` is const-stable since 1.53.0, so the `get` can go even in a `const fn`. const fn const_methods(nz: NonZero) -> u32 { nz.get().leading_zeros() - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } fn no_lint(nz: NonZero, signed: NonZero, plain: u32) { @@ -182,7 +182,7 @@ fn below_msrv(nz: NonZero) { #[clippy::msrv = "1.53"] fn meets_msrv(nz: NonZero) { let _ = nz.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // `NonZero::ilog2` was stabilized in 1.67.0, later than `leading_zeros` @@ -190,7 +190,7 @@ fn meets_msrv(nz: NonZero) { fn below_ilog2_msrv(nz: NonZero) { let _ = nz.get().ilog2(); let _ = nz.get().leading_zeros(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // `Div>` and `Rem>` were stabilized in 1.51.0 @@ -203,9 +203,9 @@ fn below_nonzero_div_msrv(value: u32, nz: NonZero) { #[clippy::msrv = "1.51"] fn meets_nonzero_div_msrv(value: u32, nz: NonZero) { let _ = value / nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get let _ = value % nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // `DivAssign>` and `RemAssign>` were stabilized in 1.79.0 @@ -218,9 +218,9 @@ fn below_nonzero_div_assign_msrv(mut value: u32, nz: NonZero) { #[clippy::msrv = "1.79"] fn meets_nonzero_div_assign_msrv(mut value: u32, nz: NonZero) { value /= nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get value %= nz.get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } // The whole expression is written in the macro, so the suggestion would point at code the caller diff --git a/tests/ui/unnecessary_nonzero_get.stderr b/tests/ui/needless_nonzero_get.stderr similarity index 80% rename from tests/ui/unnecessary_nonzero_get.stderr rename to tests/ui/needless_nonzero_get.stderr index 39b5dcf35f97..1b7ea10e0954 100644 --- a/tests/ui/unnecessary_nonzero_get.stderr +++ b/tests/ui/needless_nonzero_get.stderr @@ -1,11 +1,11 @@ error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:13:16 + --> tests/ui/needless_nonzero_get.rs:13:16 | LL | let _ = nz.get().leading_zeros(); | ^^^^^ | - = note: `-D clippy::unnecessary-nonzero-get` implied by `-D warnings` - = help: to override `-D warnings` add `#[allow(clippy::unnecessary_nonzero_get)]` + = note: `-D clippy::needless-nonzero-get` implied by `-D warnings` + = help: to override `-D warnings` add `#[allow(clippy::needless_nonzero_get)]` help: remove this | LL - let _ = nz.get().leading_zeros(); @@ -13,7 +13,7 @@ LL + let _ = nz.leading_zeros(); | error: unnecessary `get` before `trailing_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:15:16 + --> tests/ui/needless_nonzero_get.rs:15:16 | LL | let _ = nz.get().trailing_zeros(); | ^^^^^ @@ -25,7 +25,7 @@ LL + let _ = nz.trailing_zeros(); | error: unnecessary `get` before `is_power_of_two` - --> tests/ui/unnecessary_nonzero_get.rs:17:16 + --> tests/ui/needless_nonzero_get.rs:17:16 | LL | let _ = nz.get().is_power_of_two(); | ^^^^^ @@ -37,7 +37,7 @@ LL + let _ = nz.is_power_of_two(); | error: unnecessary `get` before `ilog2` - --> tests/ui/unnecessary_nonzero_get.rs:19:16 + --> tests/ui/needless_nonzero_get.rs:19:16 | LL | let _ = nz.get().ilog2(); | ^^^^^ @@ -49,7 +49,7 @@ LL + let _ = nz.ilog2(); | error: unnecessary `get` before `ilog10` - --> tests/ui/unnecessary_nonzero_get.rs:21:16 + --> tests/ui/needless_nonzero_get.rs:21:16 | LL | let _ = nz.get().ilog10(); | ^^^^^ @@ -61,7 +61,7 @@ LL + let _ = nz.ilog10(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:26:16 + --> tests/ui/needless_nonzero_get.rs:26:16 | LL | let _ = nz.get().leading_zeros(); | ^^^^^ @@ -73,7 +73,7 @@ LL + let _ = nz.leading_zeros(); | error: unnecessary `get` before `trailing_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:28:16 + --> tests/ui/needless_nonzero_get.rs:28:16 | LL | let _ = nz.get().trailing_zeros(); | ^^^^^ @@ -85,7 +85,7 @@ LL + let _ = nz.trailing_zeros(); | error: unnecessary `get` before `is_positive` - --> tests/ui/unnecessary_nonzero_get.rs:30:16 + --> tests/ui/needless_nonzero_get.rs:30:16 | LL | let _ = nz.get().is_positive(); | ^^^^^ @@ -97,7 +97,7 @@ LL + let _ = nz.is_positive(); | error: unnecessary `get` before `is_negative` - --> tests/ui/unnecessary_nonzero_get.rs:32:16 + --> tests/ui/needless_nonzero_get.rs:32:16 | LL | let _ = nz.get().is_negative(); | ^^^^^ @@ -109,7 +109,7 @@ LL + let _ = nz.is_negative(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:37:15 + --> tests/ui/needless_nonzero_get.rs:37:15 | LL | let _ = a.get().leading_zeros(); | ^^^^^ @@ -121,7 +121,7 @@ LL + let _ = a.leading_zeros(); | error: unnecessary `get` before `trailing_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:39:15 + --> tests/ui/needless_nonzero_get.rs:39:15 | LL | let _ = b.get().trailing_zeros(); | ^^^^^ @@ -133,7 +133,7 @@ LL + let _ = b.trailing_zeros(); | error: unnecessary `get` before `ilog2` - --> tests/ui/unnecessary_nonzero_get.rs:41:15 + --> tests/ui/needless_nonzero_get.rs:41:15 | LL | let _ = c.get().ilog2(); | ^^^^^ @@ -145,7 +145,7 @@ LL + let _ = c.ilog2(); | error: unnecessary `get` before `is_power_of_two` - --> tests/ui/unnecessary_nonzero_get.rs:43:15 + --> tests/ui/needless_nonzero_get.rs:43:15 | LL | let _ = d.get().is_power_of_two(); | ^^^^^ @@ -157,7 +157,7 @@ LL + let _ = d.is_power_of_two(); | error: unnecessary `get` before `ilog10` - --> tests/ui/unnecessary_nonzero_get.rs:45:15 + --> tests/ui/needless_nonzero_get.rs:45:15 | LL | let _ = e.get().ilog10(); | ^^^^^ @@ -169,7 +169,7 @@ LL + let _ = e.ilog10(); | error: unnecessary `get` before `is_negative` - --> tests/ui/unnecessary_nonzero_get.rs:50:15 + --> tests/ui/needless_nonzero_get.rs:50:15 | LL | let _ = f.get().is_negative(); | ^^^^^ @@ -181,7 +181,7 @@ LL + let _ = f.is_negative(); | error: unnecessary `get` before `is_positive` - --> tests/ui/unnecessary_nonzero_get.rs:52:15 + --> tests/ui/needless_nonzero_get.rs:52:15 | LL | let _ = g.get().is_positive(); | ^^^^^ @@ -193,7 +193,7 @@ LL + let _ = g.is_positive(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:54:15 + --> tests/ui/needless_nonzero_get.rs:54:15 | LL | let _ = h.get().leading_zeros(); | ^^^^^ @@ -205,7 +205,7 @@ LL + let _ = h.leading_zeros(); | error: unnecessary `get` before `trailing_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:56:15 + --> tests/ui/needless_nonzero_get.rs:56:15 | LL | let _ = i.get().trailing_zeros(); | ^^^^^ @@ -217,7 +217,7 @@ LL + let _ = i.trailing_zeros(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:58:15 + --> tests/ui/needless_nonzero_get.rs:58:15 | LL | let _ = j.get().leading_zeros(); | ^^^^^ @@ -229,7 +229,7 @@ LL + let _ = j.leading_zeros(); | error: unnecessary `get` before `ilog2` - --> tests/ui/unnecessary_nonzero_get.rs:63:15 + --> tests/ui/needless_nonzero_get.rs:63:15 | LL | let _ = a.get().ilog2(); | ^^^^^ @@ -241,7 +241,7 @@ LL + let _ = a.ilog2(); | error: unnecessary `get` before `is_positive` - --> tests/ui/unnecessary_nonzero_get.rs:65:15 + --> tests/ui/needless_nonzero_get.rs:65:15 | LL | let _ = b.get().is_positive(); | ^^^^^ @@ -253,7 +253,7 @@ LL + let _ = b.is_positive(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:67:15 + --> tests/ui/needless_nonzero_get.rs:67:15 | LL | let _ = r.get().leading_zeros(); | ^^^^^ @@ -265,7 +265,7 @@ LL + let _ = r.leading_zeros(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:71:41 + --> tests/ui/needless_nonzero_get.rs:71:41 | LL | let _ = NonZero::new(5u32).unwrap().get().leading_zeros(); | ^^^^^ @@ -277,7 +277,7 @@ LL + let _ = NonZero::new(5u32).unwrap().leading_zeros(); | error: unnecessary `get` before `trailing_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:73:17 + --> tests/ui/needless_nonzero_get.rs:73:17 | LL | let _ = (a).get().trailing_zeros(); | ^^^^^ @@ -289,7 +289,7 @@ LL + let _ = (a).trailing_zeros(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:78:10 + --> tests/ui/needless_nonzero_get.rs:78:10 | LL | .get() | ^^^^^ @@ -302,7 +302,7 @@ LL + let _ = a | error: unnecessary `get` before `/` - --> tests/ui/unnecessary_nonzero_get.rs:84:24 + --> tests/ui/needless_nonzero_get.rs:84:24 | LL | let _ = other / nz.get(); | ^^^^^ @@ -314,7 +314,7 @@ LL + let _ = other / nz; | error: unnecessary `get` before `%` - --> tests/ui/unnecessary_nonzero_get.rs:86:24 + --> tests/ui/needless_nonzero_get.rs:86:24 | LL | let _ = other % nz.get(); | ^^^^^ @@ -326,7 +326,7 @@ LL + let _ = other % nz; | error: unnecessary `get` before `/=` - --> tests/ui/unnecessary_nonzero_get.rs:88:17 + --> tests/ui/needless_nonzero_get.rs:88:17 | LL | value /= nz.get(); | ^^^^^ @@ -338,7 +338,7 @@ LL + value /= nz; | error: unnecessary `get` before `%=` - --> tests/ui/unnecessary_nonzero_get.rs:90:17 + --> tests/ui/needless_nonzero_get.rs:90:17 | LL | value %= nz.get(); | ^^^^^ @@ -350,7 +350,7 @@ LL + value %= nz; | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:103:8 + --> tests/ui/needless_nonzero_get.rs:103:8 | LL | nz.get().leading_zeros() | ^^^^^ @@ -362,7 +362,7 @@ LL + nz.leading_zeros() | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:184:16 + --> tests/ui/needless_nonzero_get.rs:184:16 | LL | let _ = nz.get().leading_zeros(); | ^^^^^ @@ -374,7 +374,7 @@ LL + let _ = nz.leading_zeros(); | error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get.rs:192:16 + --> tests/ui/needless_nonzero_get.rs:192:16 | LL | let _ = nz.get().leading_zeros(); | ^^^^^ @@ -386,7 +386,7 @@ LL + let _ = nz.leading_zeros(); | error: unnecessary `get` before `/` - --> tests/ui/unnecessary_nonzero_get.rs:205:24 + --> tests/ui/needless_nonzero_get.rs:205:24 | LL | let _ = value / nz.get(); | ^^^^^ @@ -398,7 +398,7 @@ LL + let _ = value / nz; | error: unnecessary `get` before `%` - --> tests/ui/unnecessary_nonzero_get.rs:207:24 + --> tests/ui/needless_nonzero_get.rs:207:24 | LL | let _ = value % nz.get(); | ^^^^^ @@ -410,7 +410,7 @@ LL + let _ = value % nz; | error: unnecessary `get` before `/=` - --> tests/ui/unnecessary_nonzero_get.rs:220:17 + --> tests/ui/needless_nonzero_get.rs:220:17 | LL | value /= nz.get(); | ^^^^^ @@ -422,7 +422,7 @@ LL + value /= nz; | error: unnecessary `get` before `%=` - --> tests/ui/unnecessary_nonzero_get.rs:222:17 + --> tests/ui/needless_nonzero_get.rs:222:17 | LL | value %= nz.get(); | ^^^^^ diff --git a/tests/ui/unnecessary_nonzero_get_unfixable.rs b/tests/ui/needless_nonzero_get_unfixable.rs similarity index 79% rename from tests/ui/unnecessary_nonzero_get_unfixable.rs rename to tests/ui/needless_nonzero_get_unfixable.rs index 2179d963fe74..211cc57ef177 100644 --- a/tests/ui/unnecessary_nonzero_get_unfixable.rs +++ b/tests/ui/needless_nonzero_get_unfixable.rs @@ -1,6 +1,6 @@ //@no-rustfix: the suggestion would remove the comment before `.get()` -#![warn(clippy::unnecessary_nonzero_get)] +#![warn(clippy::needless_nonzero_get)] use std::num::NonZero; @@ -11,16 +11,16 @@ fn main() { // This comment must not be removed by an automatic fix. let _ = nz /* keep this comment */ .get() - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get .leading_zeros(); // The operator suggestions share the same removal span, so they must preserve comments too. let _ = value / nz /* keep this comment */ .get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get value %= nz /* keep this comment */ .get(); - //~^ unnecessary_nonzero_get + //~^ needless_nonzero_get } diff --git a/tests/ui/unnecessary_nonzero_get_unfixable.stderr b/tests/ui/needless_nonzero_get_unfixable.stderr similarity index 66% rename from tests/ui/unnecessary_nonzero_get_unfixable.stderr rename to tests/ui/needless_nonzero_get_unfixable.stderr index d111834512a8..100dce7181a3 100644 --- a/tests/ui/unnecessary_nonzero_get_unfixable.stderr +++ b/tests/ui/needless_nonzero_get_unfixable.stderr @@ -1,11 +1,11 @@ error: unnecessary `get` before `leading_zeros` - --> tests/ui/unnecessary_nonzero_get_unfixable.rs:13:10 + --> tests/ui/needless_nonzero_get_unfixable.rs:13:10 | LL | .get() | ^^^^^ | - = note: `-D clippy::unnecessary-nonzero-get` implied by `-D warnings` - = help: to override `-D warnings` add `#[allow(clippy::unnecessary_nonzero_get)]` + = note: `-D clippy::needless-nonzero-get` implied by `-D warnings` + = help: to override `-D warnings` add `#[allow(clippy::needless_nonzero_get)]` help: remove this | LL - let _ = nz /* keep this comment */ @@ -14,7 +14,7 @@ LL + let _ = nz | error: unnecessary `get` before `/` - --> tests/ui/unnecessary_nonzero_get_unfixable.rs:20:14 + --> tests/ui/needless_nonzero_get_unfixable.rs:20:14 | LL | .get(); | ^^^^^ @@ -27,7 +27,7 @@ LL + / nz; | error: unnecessary `get` before `%=` - --> tests/ui/unnecessary_nonzero_get_unfixable.rs:24:10 + --> tests/ui/needless_nonzero_get_unfixable.rs:24:10 | LL | .get(); | ^^^^^ diff --git a/tests/ui/non_zero_suggestions.fixed b/tests/ui/non_zero_suggestions.fixed index 23d7386dd8cb..75209018f127 100644 --- a/tests/ui/non_zero_suggestions.fixed +++ b/tests/ui/non_zero_suggestions.fixed @@ -1,5 +1,5 @@ #![warn(clippy::non_zero_suggestions)] -#![allow(clippy::unnecessary_nonzero_get)] +#![allow(clippy::needless_nonzero_get)] use std::num::{NonZeroI8, NonZeroI16, NonZeroI32, NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroUsize}; diff --git a/tests/ui/non_zero_suggestions.rs b/tests/ui/non_zero_suggestions.rs index 767e53f5f53c..6b24ffb60fc6 100644 --- a/tests/ui/non_zero_suggestions.rs +++ b/tests/ui/non_zero_suggestions.rs @@ -1,5 +1,5 @@ #![warn(clippy::non_zero_suggestions)] -#![allow(clippy::unnecessary_nonzero_get)] +#![allow(clippy::needless_nonzero_get)] use std::num::{NonZeroI8, NonZeroI16, NonZeroI32, NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroUsize};