From e6f9f4c0e427b8931cdf9ccf40e9eee17997d250 Mon Sep 17 00:00:00 2001 From: Johann Hemmann Date: Fri, 19 Jan 2024 15:47:11 +0100 Subject: [PATCH] nonminimal_bool --- Cargo.toml | 1 - crates/ide-assists/src/handlers/inline_const_as_literal.rs | 2 +- crates/ide-db/src/active_parameter.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b9b3d3d8f45e..35b439752b35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -177,7 +177,6 @@ format_collect = "allow" large_enum_variant = "allow" needless_doctest_main = "allow" new_without_default = "allow" -nonminimal_bool = "allow" non_canonical_clone_impl = "allow" non_canonical_partial_ord_impl = "allow" non_minimal_cfg = "allow" diff --git a/crates/ide-assists/src/handlers/inline_const_as_literal.rs b/crates/ide-assists/src/handlers/inline_const_as_literal.rs index d5ede9e3c014..18437453761c 100644 --- a/crates/ide-assists/src/handlers/inline_const_as_literal.rs +++ b/crates/ide-assists/src/handlers/inline_const_as_literal.rs @@ -100,7 +100,7 @@ fn validate_type_recursively( } (_, Some(ty)) => match ty.as_builtin() { // `const A: str` is not correct, but `const A: &builtin` is. - Some(builtin) if refed || (!refed && !builtin.is_str()) => Some(()), + Some(builtin) if refed || !builtin.is_str() => Some(()), _ => None, }, _ => None, diff --git a/crates/ide-db/src/active_parameter.rs b/crates/ide-db/src/active_parameter.rs index 8d34f01b008b..5780b5a5bb93 100644 --- a/crates/ide-db/src/active_parameter.rs +++ b/crates/ide-db/src/active_parameter.rs @@ -23,7 +23,7 @@ impl ActiveParameter { let idx = active_parameter?; let mut params = signature.params(sema.db); - if !(idx < params.len()) { + if idx >= params.len() { cov_mark::hit!(too_many_arguments); return None; }