From 78fa596839bcf3b367b042d0c7eeb8350850c12c Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 4 Mar 2024 13:37:23 -0500 Subject: [PATCH] Enable `clippy::crate_in_macro_def` (#8845) This PR enables the [`clippy::crate_in_macro_def`](https://rust-lang.github.io/rust-clippy/master/index.html#/crate_in_macro_def) rule and fixes the outstanding violations. Release Notes: - N/A --- crates/collab/src/db/tests.rs | 4 ++-- tooling/xtask/src/main.rs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/collab/src/db/tests.rs b/crates/collab/src/db/tests.rs index b07f7a84e1..35da659e54 100644 --- a/crates/collab/src/db/tests.rs +++ b/crates/collab/src/db/tests.rs @@ -109,13 +109,13 @@ macro_rules! test_both_dbs { ($test_name:ident, $postgres_test_name:ident, $sqlite_test_name:ident) => { #[gpui::test] async fn $postgres_test_name(cx: &mut gpui::TestAppContext) { - let test_db = crate::db::TestDb::postgres(cx.executor().clone()); + let test_db = $crate::db::TestDb::postgres(cx.executor().clone()); $test_name(test_db.db()).await; } #[gpui::test] async fn $sqlite_test_name(cx: &mut gpui::TestAppContext) { - let test_db = crate::db::TestDb::sqlite(cx.executor().clone()); + let test_db = $crate::db::TestDb::sqlite(cx.executor().clone()); $test_name(test_db.db()).await; } }; diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs index d93d2b7e5e..44947a4367 100644 --- a/tooling/xtask/src/main.rs +++ b/tooling/xtask/src/main.rs @@ -84,7 +84,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> { "clippy::borrowed_box", "clippy::cast_abs_to_unsigned", "clippy::cmp_owned", - "clippy::crate_in_macro_def", "clippy::derive_ord_xor_partial_ord", "clippy::eq_op", "clippy::implied_bounds_in_impls",