Rename logic_bug to overly_complex_bool_expr

Closes rust-lang#1916

Author: guerinoni

CHANGELOG.md

@@ -3818,6 +3818,7 @@ Released 2018-09-13
 [`or_then_unwrap`]: https://rust-lang.github.io/rust-clippy/master/index.html#or_then_unwrap
 [`out_of_bounds_indexing`]: https://rust-lang.github.io/rust-clippy/master/index.html#out_of_bounds_indexing
 [`overflow_check_conditional`]: https://rust-lang.github.io/rust-clippy/master/index.html#overflow_check_conditional
+[`overly_complex_bool_expr`]: https://rust-lang.github.io/rust-clippy/master/index.html#overly_complex_bool_expr
 [`panic`]: https://rust-lang.github.io/rust-clippy/master/index.html#panic
 [`panic_in_result_fn`]: https://rust-lang.github.io/rust-clippy/master/index.html#panic_in_result_fn
 [`panic_params`]: https://rust-lang.github.io/rust-clippy/master/index.html#panic_params

clippy_lints/src/booleans.rs

@@ -64,15 +64,15 @@ declare_clippy_lint! {
  /// if a {}
  /// ```
  #[clippy::version = "pre 1.29.0"]
- pub LOGIC_BUG,
+ pub OVERLY_COMPLEX_BOOL_EXPR,
  correctness,
  "boolean expressions that contain terminals which can be eliminated"
 }
 
 // For each pairs, both orders are considered.
 const METHODS_WITH_NEGATION: [(&str, &str); 2] = [("is_some", "is_none"), ("is_err", "is_ok")];
 
-declare_lint_pass!(NonminimalBool => [NONMINIMAL_BOOL, LOGIC_BUG]);
+declare_lint_pass!(NonminimalBool => [NONMINIMAL_BOOL, OVERLY_COMPLEX_BOOL_EXPR]);
 
 impl<'tcx> LateLintPass<'tcx> for NonminimalBool {
  fn check_fn(
@@ -396,7 +396,7 @@ impl<'a, 'tcx> NonminimalBoolVisitor<'a, 'tcx> {
  if stats.terminals[i] != 0 && simplified_stats.terminals[i] == 0 {
  span_lint_hir_and_then(
  self.cx,
- LOGIC_BUG,
+ OVERLY_COMPLEX_BOOL_EXPR,
  e.hir_id,
  e.span,
  "this boolean expression contains a logic bug",

clippy_lints/src/lib.register_all.rs

@@ -17,8 +17,8 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![
  LintId::of(await_holding_invalid::AWAIT_HOLDING_REFCELL_REF),
  LintId::of(blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS),
  LintId::of(bool_assert_comparison::BOOL_ASSERT_COMPARISON),
- LintId::of(booleans::LOGIC_BUG),
  LintId::of(booleans::NONMINIMAL_BOOL),
+ LintId::of(booleans::OVERLY_COMPLEX_BOOL_EXPR),
  LintId::of(borrow_deref_ref::BORROW_DEREF_REF),
  LintId::of(bytes_count_to_len::BYTES_COUNT_TO_LEN),
  LintId::of(casts::CAST_ABS_TO_UNSIGNED),

clippy_lints/src/lib.register_correctness.rs

@@ -8,7 +8,7 @@ store.register_group(true, "clippy::correctness", Some("clippy_correctness"), ve
  LintId::of(attrs::DEPRECATED_SEMVER),
  LintId::of(attrs::MISMATCHED_TARGET_OS),
  LintId::of(attrs::USELESS_ATTRIBUTE),
- LintId::of(booleans::LOGIC_BUG),
+ LintId::of(booleans::OVERLY_COMPLEX_BOOL_EXPR),
  LintId::of(casts::CAST_REF_TO_MUT),
  LintId::of(casts::CAST_SLICE_DIFFERENT_SIZES),
  LintId::of(copies::IFS_SAME_COND),

clippy_lints/src/lib.register_lints.rs

@@ -57,8 +57,8 @@ store.register_lints(&[
  await_holding_invalid::AWAIT_HOLDING_REFCELL_REF,
  blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS,
  bool_assert_comparison::BOOL_ASSERT_COMPARISON,
- booleans::LOGIC_BUG,
  booleans::NONMINIMAL_BOOL,
+ booleans::OVERLY_COMPLEX_BOOL_EXPR,
  borrow_as_ptr::BORROW_AS_PTR,
  borrow_deref_ref::BORROW_DEREF_REF,
  bytecount::NAIVE_BYTECOUNT,

clippy_lints/src/renamed_lints.rs

@@ -2,10 +2,10 @@
 
 #[rustfmt::skip]
 pub static RENAMED_LINTS: &[(&str, &str)] = &[
+ ("clippy::blacklisted_name", "clippy::disallowed_names"),
  ("clippy::block_in_if_condition_expr", "clippy::blocks_in_if_conditions"),
  ("clippy::block_in_if_condition_stmt", "clippy::blocks_in_if_conditions"),
  ("clippy::box_vec", "clippy::box_collection"),
- ("clippy::blacklisted_name", "clippy::disallowed_names"),
  ("clippy::const_static_lifetime", "clippy::redundant_static_lifetimes"),
  ("clippy::cyclomatic_complexity", "clippy::cognitive_complexity"),
  ("clippy::disallowed_method", "clippy::disallowed_methods"),
@@ -15,6 +15,7 @@ pub static RENAMED_LINTS: &[(&str, &str)] = &[
  ("clippy::for_loop_over_result", "clippy::for_loops_over_fallibles"),
  ("clippy::identity_conversion", "clippy::useless_conversion"),
  ("clippy::if_let_some_result", "clippy::match_result_ok"),
+ ("clippy::logic_bug", "clippy::overly_complex_bool_expr"),
  ("clippy::new_without_default_derive", "clippy::new_without_default"),
  ("clippy::option_and_then_some", "clippy::bind_instead_of_map"),
  ("clippy::option_expect_used", "clippy::expect_used"),

tests/ui/diverging_sub_expression.rs

@@ -1,5 +1,5 @@
 #![warn(clippy::diverging_sub_expression)]
-#![allow(clippy::match_same_arms, clippy::logic_bug)]
+#![allow(clippy::match_same_arms, clippy::overly_complex_bool_expr)]
 #[allow(clippy::empty_loop)]
 fn diverge() -> ! {
  loop {}

tests/ui/expect_tool_lint_rfc_2383.rs

@@ -98,7 +98,7 @@ mod clippy_ok {
  let _ = if true { 42 } else { 42 };
  }
 
- #[expect(clippy::logic_bug)]
+ #[expect(clippy::overly_complex_bool_expr)]
  fn burger() {
  let a = false;
  let b = true;
@@ -127,7 +127,7 @@ mod clippy_warn {
  let _ = if true { 33 } else { 42 };
  }
 
- #[expect(clippy::logic_bug)]
+ #[expect(clippy::overly_complex_bool_expr)]
  fn burger() {
  let a = false;
  let b = true;

tests/ui/expect_tool_lint_rfc_2383.stderr

@@ -33,8 +33,8 @@ LL | #[expect(clippy::if_same_then_else)]
 error: this lint expectation is unfulfilled
  --> $DIR/expect_tool_lint_rfc_2383.rs:130:14
  |
-LL | #[expect(clippy::logic_bug)]
- | ^^^^^^^^^^^^^^^^^
+LL | #[expect(clippy::overly_complex_bool_expr)]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 6 previous errors
 

tests/ui/logic_bug.rs renamed to tests/ui/overly_complex_bool_expr.rs

@@ -1,6 +1,6 @@
 #![feature(lint_reasons)]
 #![allow(unused, clippy::diverging_sub_expression)]
-#![warn(clippy::logic_bug)]
+#![warn(clippy::overly_complex_bool_expr)]
 
 fn main() {
  let a: bool = unimplemented!();
@@ -29,6 +29,6 @@ fn equality_stuff() {
 fn check_expect() {
  let a: i32 = unimplemented!();
  let b: i32 = unimplemented!();
- #[expect(clippy::logic_bug)]
+ #[expect(clippy::overly_complex_bool_expr)]
  let _ = a < b && a >= b;
 }