move [assertions_on_result_states] to restriction

Signed-off-by: tabokie <xy.tao@outlook.com>
rust-lang · Aug 2, 2022 · b608ec8 · b608ec8
1 parent 9538d2d
commit b608ec8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/tools/clippy/clippy_lints/src/assertions_on_result_states.rs b/src/tools/clippy/clippy_lints/src/assertions_on_result_states.rs
@@ -19,6 +19,9 @@ declare_clippy_lint! {
  /// ### Why is this bad?
  /// An assertion failure cannot output an useful message of the error.
  ///
+ /// ### Known problems
+ /// The suggested replacement decreases the readability of code and log output.
+ ///
  /// ### Example
  /// ```rust,ignore
  /// # let r = Ok::<_, ()>(());
@@ -28,7 +31,7 @@ declare_clippy_lint! {
  /// ```
  #[clippy::version = "1.64.0"]
  pub ASSERTIONS_ON_RESULT_STATES,
- style,
+ restriction,
  "`assert!(r.is_ok())`/`assert!(r.is_err())` gives worse error message than directly calling `r.unwrap()`/`r.unwrap_err()`"
 }
 

diff --git a/src/tools/clippy/clippy_lints/src/lib.register_all.rs b/src/tools/clippy/clippy_lints/src/lib.register_all.rs
@@ -6,7 +6,6 @@ store.register_group(true, "clippy::all", Some("clippy_all"), vec![
  LintId::of(almost_complete_letter_range::ALMOST_COMPLETE_LETTER_RANGE),
  LintId::of(approx_const::APPROX_CONSTANT),
  LintId::of(assertions_on_constants::ASSERTIONS_ON_CONSTANTS),
- LintId::of(assertions_on_result_states::ASSERTIONS_ON_RESULT_STATES),
  LintId::of(async_yields_async::ASYNC_YIELDS_ASYNC),
  LintId::of(attrs::BLANKET_CLIPPY_RESTRICTION_LINTS),
  LintId::of(attrs::DEPRECATED_CFG_ATTR),

diff --git a/src/tools/clippy/clippy_lints/src/lib.register_restriction.rs b/src/tools/clippy/clippy_lints/src/lib.register_restriction.rs
@@ -7,6 +7,7 @@ store.register_group(true, "clippy::restriction", Some("clippy_restriction"), ve
  LintId::of(as_underscore::AS_UNDERSCORE),
  LintId::of(asm_syntax::INLINE_ASM_X86_ATT_SYNTAX),
  LintId::of(asm_syntax::INLINE_ASM_X86_INTEL_SYNTAX),
+ LintId::of(assertions_on_result_states::ASSERTIONS_ON_RESULT_STATES),
  LintId::of(attrs::ALLOW_ATTRIBUTES_WITHOUT_REASON),
  LintId::of(casts::FN_TO_NUMERIC_CAST_ANY),
  LintId::of(create_dir::CREATE_DIR),

diff --git a/src/tools/clippy/clippy_lints/src/lib.register_style.rs b/src/tools/clippy/clippy_lints/src/lib.register_style.rs
@@ -4,7 +4,6 @@
 
 store.register_group(true, "clippy::style", Some("clippy_style"), vec![
  LintId::of(assertions_on_constants::ASSERTIONS_ON_CONSTANTS),
- LintId::of(assertions_on_result_states::ASSERTIONS_ON_RESULT_STATES),
  LintId::of(blacklisted_name::BLACKLISTED_NAME),
  LintId::of(blocks_in_if_conditions::BLOCKS_IN_IF_CONDITIONS),
  LintId::of(bool_assert_comparison::BOOL_ASSERT_COMPARISON),