Skip to content

Commit 394f3fc

Browse files
committed
Drop uplifted clippy::precedence
1 parent ea4d628 commit 394f3fc

File tree

13 files changed

+74
-263
lines changed

13 files changed

+74
-263
lines changed

src/tools/clippy/clippy_lints/src/declared_lints.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,6 @@ pub(crate) static LINTS: &[&crate::LintInfo] = &[
561561
crate::pass_by_ref_or_value::TRIVIALLY_COPY_PASS_BY_REF_INFO,
562562
crate::pattern_type_mismatch::PATTERN_TYPE_MISMATCH_INFO,
563563
crate::permissions_set_readonly_false::PERMISSIONS_SET_READONLY_FALSE_INFO,
564-
crate::precedence::PRECEDENCE_INFO,
565564
crate::ptr::CMP_NULL_INFO,
566565
crate::ptr::INVALID_NULL_PTR_USAGE_INFO,
567566
crate::ptr::MUT_FROM_REF_INFO,

src/tools/clippy/clippy_lints/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ mod partialeq_to_none;
264264
mod pass_by_ref_or_value;
265265
mod pattern_type_mismatch;
266266
mod permissions_set_readonly_false;
267-
mod precedence;
268267
mod ptr;
269268
mod ptr_offset_with_cast;
270269
mod pub_use;
@@ -809,7 +808,6 @@ pub fn register_lints(store: &mut rustc_lint::LintStore, conf: &'static Conf) {
809808
store.register_late_pass(|_| Box::new(returns::Return));
810809
store.register_early_pass(|| Box::new(collapsible_if::CollapsibleIf));
811810
store.register_late_pass(|_| Box::new(items_after_statements::ItemsAfterStatements));
812-
store.register_early_pass(|| Box::new(precedence::Precedence));
813811
store.register_late_pass(|_| Box::new(needless_parens_on_range_literals::NeedlessParensOnRangeLiterals));
814812
store.register_early_pass(|| Box::new(needless_continue::NeedlessContinue));
815813
store.register_early_pass(|| Box::new(redundant_else::RedundantElse));

src/tools/clippy/clippy_lints/src/renamed_lints.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
5252
("clippy::invalid_utf8_in_unchecked", "invalid_from_utf8_unchecked"),
5353
("clippy::let_underscore_drop", "let_underscore_drop"),
5454
("clippy::mem_discriminant_non_enum", "enum_intrinsics_non_enums"),
55+
("clippy::precedence", "ambiguous_precedence"),
5556
("clippy::panic_params", "non_fmt_panics"),
5657
("clippy::positional_named_format_parameters", "named_arguments_used_positionally"),
5758
("clippy::temporary_cstring_as_ptr", "temporary_cstring_as_ptr"),

src/tools/clippy/tests/ui/neg_multiply.fixed

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![warn(clippy::neg_multiply)]
2-
#![allow(clippy::no_effect, clippy::unnecessary_operation, clippy::precedence)]
3-
#![allow(unused)]
2+
#![allow(clippy::no_effect, clippy::unnecessary_operation)]
3+
#![allow(unused, ambiguous_precedence)]
44

55
use std::ops::Mul;
66

src/tools/clippy/tests/ui/neg_multiply.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#![warn(clippy::neg_multiply)]
2-
#![allow(clippy::no_effect, clippy::unnecessary_operation, clippy::precedence)]
3-
#![allow(unused)]
2+
#![allow(clippy::no_effect, clippy::unnecessary_operation)]
3+
#![allow(unused, ambiguous_precedence)]
44

55
use std::ops::Mul;
66

src/tools/clippy/tests/ui/precedence.fixed

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/tools/clippy/tests/ui/precedence.rs

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/tools/clippy/tests/ui/precedence.stderr

Lines changed: 0 additions & 77 deletions
This file was deleted.

src/tools/clippy/tests/ui/rename.fixed

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#![allow(invalid_reference_casting)]
3333
#![allow(suspicious_double_ref_op)]
3434
#![allow(invalid_nan_comparisons)]
35+
#![allow(ambiguous_precedence)]
3536
#![allow(drop_bounds)]
3637
#![allow(dropping_copy_types)]
3738
#![allow(dropping_references)]
@@ -103,6 +104,7 @@
103104
#![warn(enum_intrinsics_non_enums)]
104105
#![warn(non_fmt_panics)]
105106
#![warn(named_arguments_used_positionally)]
107+
#![warn(ambiguous_precedence)]
106108
#![warn(temporary_cstring_as_ptr)]
107109
#![warn(undropped_manually_drops)]
108110
#![warn(unknown_lints)]

src/tools/clippy/tests/ui/rename.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#![allow(invalid_reference_casting)]
3333
#![allow(suspicious_double_ref_op)]
3434
#![allow(invalid_nan_comparisons)]
35+
#![allow(ambiguous_precedence)]
3536
#![allow(drop_bounds)]
3637
#![allow(dropping_copy_types)]
3738
#![allow(dropping_references)]
@@ -103,6 +104,7 @@
103104
#![warn(clippy::mem_discriminant_non_enum)]
104105
#![warn(clippy::panic_params)]
105106
#![warn(clippy::positional_named_format_parameters)]
107+
#![warn(clippy::precedence)]
106108
#![warn(clippy::temporary_cstring_as_ptr)]
107109
#![warn(clippy::undropped_manually_drops)]
108110
#![warn(clippy::unknown_clippy_lints)]

0 commit comments

Comments
 (0)