From 6685d3ac976acd3c64b93b7d9bcc67e10b9b3f9f Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sun, 3 Mar 2024 10:43:13 -0500 Subject: [PATCH] Enable `clippy::redundant_guards` (#8770) This PR enables the [`clippy::redundant_guards`](https://rust-lang.github.io/rust-clippy/master/index.html#/redundant_guards) rule and fixes the outstanding violations. Release Notes: - N/A --- crates/project/src/project.rs | 2 +- tooling/xtask/src/main.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index c630a7dc9d..71c68a989d 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -9379,7 +9379,7 @@ fn relativize_path(base: &Path, path: &Path) -> PathBuf { } (None, _) => components.push(Component::ParentDir), (Some(a), Some(b)) if components.is_empty() && a == b => (), - (Some(a), Some(b)) if b == Component::CurDir => components.push(a), + (Some(a), Some(Component::CurDir)) => components.push(a), (Some(a), Some(_)) => { components.push(Component::ParentDir); for _ in base_components { diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs index 2862d27d51..a0ad0fcd83 100644 --- a/tooling/xtask/src/main.rs +++ b/tooling/xtask/src/main.rs @@ -103,7 +103,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> { "clippy::non_canonical_clone_impl", "clippy::non_canonical_partial_ord_impl", "clippy::redundant_closure_call", - "clippy::redundant_guards", "clippy::reversed_empty_ranges", "clippy::single_range_in_vec_init", "clippy::suspicious_to_owned",