mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove '#[expect(clippy::similar_names)]' where needed to pass dogfood tests

Browse Source
This commit is contained in:
Trevor Gross 2024-02-09 23:36:31 -06:00
parent 09f18f61c6
commit 5250afb77d
8 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clippy_lints/src/item_name_repetitions.rs
View File

@ -385,7 +385,6 @@ impl LateLintPass<'_> for ItemNameRepetitions {
assert!(last.is_some()); assert!(last.is_some());
} }
#[expect(clippy::similar_names)]
fn check_item(&mut self, cx: &LateContext<'_>, item: &Item<'_>) { fn check_item(&mut self, cx: &LateContext<'_>, item: &Item<'_>) {
let item_name = item.ident.name.as_str(); let item_name = item.ident.name.as_str();
let item_camel = to_camel_case(item_name); let item_camel = to_camel_case(item_name);

1
clippy_lints/src/operators/double_comparison.rs
View File

@ -8,7 +8,6 @@ use rustc_span::Span;
use super::DOUBLE_COMPARISONS; use super::DOUBLE_COMPARISONS;
#[expect(clippy::similar_names)]
pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, op: BinOpKind, lhs: &'tcx Expr<'_>, rhs: &'tcx Expr<'_>, span: Span) { pub(super) fn check<'tcx>(cx: &LateContext<'tcx>, op: BinOpKind, lhs: &'tcx Expr<'_>, rhs: &'tcx Expr<'_>, span: Span) {
let (lkind, llhs, lrhs, rkind, rlhs, rrhs) = match (&lhs.kind, &rhs.kind) { let (lkind, llhs, lrhs, rkind, rlhs, rrhs) = match (&lhs.kind, &rhs.kind) {
(ExprKind::Binary(lb, llhs, lrhs), ExprKind::Binary(rb, rlhs, rrhs)) => { (ExprKind::Binary(lb, llhs, lrhs), ExprKind::Binary(rb, rlhs, rrhs)) => {

2
clippy_lints/src/operators/op_ref.rs
View File

@ -11,7 +11,7 @@ use rustc_middle::ty::{self, Ty};
use super::OP_REF; use super::OP_REF;
#[expect(clippy::similar_names, clippy::too_many_lines)] #[expect(clippy::too_many_lines)]
pub(crate) fn check<'tcx>( pub(crate) fn check<'tcx>(
cx: &LateContext<'tcx>, cx: &LateContext<'tcx>,
e: &'tcx Expr<'_>, e: &'tcx Expr<'_>,

4
clippy_utils/src/ast_utils.rs
View File

@ -2,7 +2,7 @@
//! //!
//! - The `eq_foobar` functions test for semantic equality but ignores `NodeId`s and `Span`s. //! - The `eq_foobar` functions test for semantic equality but ignores `NodeId`s and `Span`s.
#![allow(clippy::similar_names, clippy::wildcard_imports, clippy::enum_glob_use)] #![allow(clippy::wildcard_imports, clippy::enum_glob_use)]
use crate::{both, over}; use crate::{both, over};
use rustc_ast::ptr::P; use rustc_ast::ptr::P;
@ -296,7 +296,7 @@ pub fn eq_item<K>(l: &Item<K>, r: &Item<K>, mut eq_kind: impl FnMut(&K, &K) -> b
eq_id(l.ident, r.ident) && over(&l.attrs, &r.attrs, eq_attr) && eq_vis(&l.vis, &r.vis) && eq_kind(&l.kind, &r.kind) eq_id(l.ident, r.ident) && over(&l.attrs, &r.attrs, eq_attr) && eq_vis(&l.vis, &r.vis) && eq_kind(&l.kind, &r.kind)
} }
#[expect(clippy::too_many_lines)] // Just a big match statement #[expect(clippy::similar_names, clippy::too_many_lines)] // Just a big match statement
pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool { pub fn eq_item_kind(l: &ItemKind, r: &ItemKind) -> bool {
use ItemKind::*; use ItemKind::*;
match (l, r) { match (l, r) {

5
clippy_utils/src/hir_utils.rs
View File

@ -132,7 +132,6 @@ impl HirEqInterExpr<'_, '_, '_> {
} }
/// Checks whether two blocks are the same. /// Checks whether two blocks are the same.
#[expect(clippy::similar_names)]
fn eq_block(&mut self, left: &Block<'_>, right: &Block<'_>) -> bool { fn eq_block(&mut self, left: &Block<'_>, right: &Block<'_>) -> bool {
use TokenKind::{Semi, Whitespace}; use TokenKind::{Semi, Whitespace};
if left.stmts.len() != right.stmts.len() { if left.stmts.len() != right.stmts.len() {
@ -247,7 +246,7 @@ impl HirEqInterExpr<'_, '_, '_> {
res res
} }
#[expect(clippy::similar_names, clippy::too_many_lines)] #[expect(clippy::too_many_lines)]
pub fn eq_expr(&mut self, left: &Expr<'_>, right: &Expr<'_>) -> bool { pub fn eq_expr(&mut self, left: &Expr<'_>, right: &Expr<'_>) -> bool {
if !self.check_ctxt(left.span.ctxt(), right.span.ctxt()) { if !self.check_ctxt(left.span.ctxt(), right.span.ctxt()) {
return false; return false;
@ -463,7 +462,6 @@ impl HirEqInterExpr<'_, '_, '_> {
} }
} }
#[expect(clippy::similar_names)]
fn eq_qpath(&mut self, left: &QPath<'_>, right: &QPath<'_>) -> bool { fn eq_qpath(&mut self, left: &QPath<'_>, right: &QPath<'_>) -> bool {
match (left, right) { match (left, right) {
(&QPath::Resolved(ref lty, lpath), &QPath::Resolved(ref rty, rpath)) => { (&QPath::Resolved(ref lty, lpath), &QPath::Resolved(ref rty, rpath)) => {
@ -1158,7 +1156,6 @@ pub fn hash_expr(cx: &LateContext<'_>, e: &Expr<'_>) -> u64 {
h.finish() h.finish()
} }
#[expect(clippy::similar_names)]
fn eq_span_tokens( fn eq_span_tokens(
cx: &LateContext<'_>, cx: &LateContext<'_>,
left: impl SpanRange, left: impl SpanRange,

1
clippy_utils/src/qualify_min_const_fn.rs
View File

@ -389,7 +389,6 @@ fn is_const_fn(tcx: TyCtxt<'_>, def_id: DefId, msrv: &Msrv) -> bool {
}) })
} }
#[expect(clippy::similar_names)] // bit too pedantic
fn is_ty_const_destruct<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, body: &Body<'tcx>) -> bool { fn is_ty_const_destruct<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>, body: &Body<'tcx>) -> bool {
// FIXME(effects, fee1-dead) revert to const destruct once it works again // FIXME(effects, fee1-dead) revert to const destruct once it works again
#[expect(unused)] #[expect(unused)]

1
tests/ui/approx_const.rs
View File

@ -1,5 +1,4 @@
#[warn(clippy::approx_constant)] #[warn(clippy::approx_constant)]
#[allow(clippy::similar_names)]
fn main() { fn main() {
let my_e = 2.7182; let my_e = 2.7182;
//~^ ERROR: approximate value of `f{32, 64}::consts::E` found //~^ ERROR: approximate value of `f{32, 64}::consts::E` found

46
tests/ui/approx_const.stderr
View File

@ -1,5 +1,5 @@
error: approximate value of `f{32, 64}::consts::E` found error: approximate value of `f{32, 64}::consts::E` found
--> $DIR/approx_const.rs:4:16 --> $DIR/approx_const.rs:3:16
| |
LL | let my_e = 2.7182; LL | let my_e = 2.7182;
| ^^^^^^ | ^^^^^^
@ -9,7 +9,7 @@ LL | let my_e = 2.7182;
= help: to override `-D warnings` add `#[allow(clippy::approx_constant)]` = help: to override `-D warnings` add `#[allow(clippy::approx_constant)]`
error: approximate value of `f{32, 64}::consts::E` found error: approximate value of `f{32, 64}::consts::E` found
--> $DIR/approx_const.rs:6:20 --> $DIR/approx_const.rs:5:20
| |
LL | let almost_e = 2.718; LL | let almost_e = 2.718;
| ^^^^^ | ^^^^^
@ -17,7 +17,7 @@ LL | let almost_e = 2.718;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_1_PI` found error: approximate value of `f{32, 64}::consts::FRAC_1_PI` found
--> $DIR/approx_const.rs:10:24 --> $DIR/approx_const.rs:9:24
| |
LL | let my_1_frac_pi = 0.3183; LL | let my_1_frac_pi = 0.3183;
| ^^^^^^ | ^^^^^^
@ -25,7 +25,7 @@ LL | let my_1_frac_pi = 0.3183;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_1_SQRT_2` found error: approximate value of `f{32, 64}::consts::FRAC_1_SQRT_2` found
--> $DIR/approx_const.rs:14:28 --> $DIR/approx_const.rs:13:28
| |
LL | let my_frac_1_sqrt_2 = 0.70710678; LL | let my_frac_1_sqrt_2 = 0.70710678;
| ^^^^^^^^^^ | ^^^^^^^^^^
@ -33,7 +33,7 @@ LL | let my_frac_1_sqrt_2 = 0.70710678;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_1_SQRT_2` found error: approximate value of `f{32, 64}::consts::FRAC_1_SQRT_2` found
--> $DIR/approx_const.rs:16:32 --> $DIR/approx_const.rs:15:32
| |
LL | let almost_frac_1_sqrt_2 = 0.70711; LL | let almost_frac_1_sqrt_2 = 0.70711;
| ^^^^^^^ | ^^^^^^^
@ -41,7 +41,7 @@ LL | let almost_frac_1_sqrt_2 = 0.70711;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_2_PI` found error: approximate value of `f{32, 64}::consts::FRAC_2_PI` found
--> $DIR/approx_const.rs:20:24 --> $DIR/approx_const.rs:19:24
| |
LL | let my_frac_2_pi = 0.63661977; LL | let my_frac_2_pi = 0.63661977;
| ^^^^^^^^^^ | ^^^^^^^^^^
@ -49,7 +49,7 @@ LL | let my_frac_2_pi = 0.63661977;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_2_SQRT_PI` found error: approximate value of `f{32, 64}::consts::FRAC_2_SQRT_PI` found
--> $DIR/approx_const.rs:24:27 --> $DIR/approx_const.rs:23:27
| |
LL | let my_frac_2_sq_pi = 1.128379; LL | let my_frac_2_sq_pi = 1.128379;
| ^^^^^^^^ | ^^^^^^^^
@ -57,7 +57,7 @@ LL | let my_frac_2_sq_pi = 1.128379;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_PI_2` found error: approximate value of `f{32, 64}::consts::FRAC_PI_2` found
--> $DIR/approx_const.rs:28:24 --> $DIR/approx_const.rs:27:24
| |
LL | let my_frac_pi_2 = 1.57079632679; LL | let my_frac_pi_2 = 1.57079632679;
| ^^^^^^^^^^^^^ | ^^^^^^^^^^^^^
@ -65,7 +65,7 @@ LL | let my_frac_pi_2 = 1.57079632679;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_PI_3` found error: approximate value of `f{32, 64}::consts::FRAC_PI_3` found
--> $DIR/approx_const.rs:32:24 --> $DIR/approx_const.rs:31:24
| |
LL | let my_frac_pi_3 = 1.04719755119; LL | let my_frac_pi_3 = 1.04719755119;
| ^^^^^^^^^^^^^ | ^^^^^^^^^^^^^
@ -73,7 +73,7 @@ LL | let my_frac_pi_3 = 1.04719755119;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_PI_4` found error: approximate value of `f{32, 64}::consts::FRAC_PI_4` found
--> $DIR/approx_const.rs:36:24 --> $DIR/approx_const.rs:35:24
| |
LL | let my_frac_pi_4 = 0.785398163397; LL | let my_frac_pi_4 = 0.785398163397;
| ^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^
@ -81,7 +81,7 @@ LL | let my_frac_pi_4 = 0.785398163397;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_PI_6` found error: approximate value of `f{32, 64}::consts::FRAC_PI_6` found
--> $DIR/approx_const.rs:40:24 --> $DIR/approx_const.rs:39:24
| |
LL | let my_frac_pi_6 = 0.523598775598; LL | let my_frac_pi_6 = 0.523598775598;
| ^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^
@ -89,7 +89,7 @@ LL | let my_frac_pi_6 = 0.523598775598;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::FRAC_PI_8` found error: approximate value of `f{32, 64}::consts::FRAC_PI_8` found
--> $DIR/approx_const.rs:44:24 --> $DIR/approx_const.rs:43:24
| |
LL | let my_frac_pi_8 = 0.3926990816987; LL | let my_frac_pi_8 = 0.3926990816987;
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
@ -97,7 +97,7 @@ LL | let my_frac_pi_8 = 0.3926990816987;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::LN_10` found error: approximate value of `f{32, 64}::consts::LN_10` found
--> $DIR/approx_const.rs:48:20 --> $DIR/approx_const.rs:47:20
| |
LL | let my_ln_10 = 2.302585092994046; LL | let my_ln_10 = 2.302585092994046;
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
@ -105,7 +105,7 @@ LL | let my_ln_10 = 2.302585092994046;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::LN_2` found error: approximate value of `f{32, 64}::consts::LN_2` found
--> $DIR/approx_const.rs:52:19 --> $DIR/approx_const.rs:51:19
| |
LL | let my_ln_2 = 0.6931471805599453; LL | let my_ln_2 = 0.6931471805599453;
| ^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^
@ -113,7 +113,7 @@ LL | let my_ln_2 = 0.6931471805599453;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::LOG10_E` found error: approximate value of `f{32, 64}::consts::LOG10_E` found
--> $DIR/approx_const.rs:56:22 --> $DIR/approx_const.rs:55:22
| |
LL | let my_log10_e = 0.4342944819032518; LL | let my_log10_e = 0.4342944819032518;
| ^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^
@ -121,7 +121,7 @@ LL | let my_log10_e = 0.4342944819032518;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::LOG2_E` found error: approximate value of `f{32, 64}::consts::LOG2_E` found
--> $DIR/approx_const.rs:60:21 --> $DIR/approx_const.rs:59:21
| |
LL | let my_log2_e = 1.4426950408889634; LL | let my_log2_e = 1.4426950408889634;
| ^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^
@ -129,7 +129,7 @@ LL | let my_log2_e = 1.4426950408889634;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::LOG2_10` found error: approximate value of `f{32, 64}::consts::LOG2_10` found
--> $DIR/approx_const.rs:64:19 --> $DIR/approx_const.rs:63:19
| |
LL | let log2_10 = 3.321928094887362; LL | let log2_10 = 3.321928094887362;
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
@ -137,7 +137,7 @@ LL | let log2_10 = 3.321928094887362;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::LOG10_2` found error: approximate value of `f{32, 64}::consts::LOG10_2` found
--> $DIR/approx_const.rs:68:19 --> $DIR/approx_const.rs:67:19
| |
LL | let log10_2 = 0.301029995663981; LL | let log10_2 = 0.301029995663981;
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
@ -145,7 +145,7 @@ LL | let log10_2 = 0.301029995663981;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::PI` found error: approximate value of `f{32, 64}::consts::PI` found
--> $DIR/approx_const.rs:72:17 --> $DIR/approx_const.rs:71:17
| |
LL | let my_pi = 3.1415; LL | let my_pi = 3.1415;
| ^^^^^^ | ^^^^^^
@ -153,7 +153,7 @@ LL | let my_pi = 3.1415;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::PI` found error: approximate value of `f{32, 64}::consts::PI` found
--> $DIR/approx_const.rs:74:21 --> $DIR/approx_const.rs:73:21
| |
LL | let almost_pi = 3.14; LL | let almost_pi = 3.14;
| ^^^^ | ^^^^
@ -161,7 +161,7 @@ LL | let almost_pi = 3.14;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::SQRT_2` found error: approximate value of `f{32, 64}::consts::SQRT_2` found
--> $DIR/approx_const.rs:78:18 --> $DIR/approx_const.rs:77:18
| |
LL | let my_sq2 = 1.4142; LL | let my_sq2 = 1.4142;
| ^^^^^^ | ^^^^^^
@ -169,7 +169,7 @@ LL | let my_sq2 = 1.4142;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::TAU` found error: approximate value of `f{32, 64}::consts::TAU` found
--> $DIR/approx_const.rs:82:18 --> $DIR/approx_const.rs:81:18
| |
LL | let my_tau = 6.2832; LL | let my_tau = 6.2832;
| ^^^^^^ | ^^^^^^
@ -177,7 +177,7 @@ LL | let my_tau = 6.2832;
= help: consider using the constant directly = help: consider using the constant directly
error: approximate value of `f{32, 64}::consts::TAU` found error: approximate value of `f{32, 64}::consts::TAU` found
--> $DIR/approx_const.rs:84:22 --> $DIR/approx_const.rs:83:22
| |
LL | let almost_tau = 6.28; LL | let almost_tau = 6.28;
| ^^^^ | ^^^^