From a3c38ddbc58bb4f7aa0946d58c838e80d42bf833 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Thu, 26 Dec 2024 11:57:11 +0100
Subject: [PATCH] clippy: Merge config files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The content of `.clippy.toml` was unintentionally overriding the contents of `clippy.toml` 😅
---
 .clippy.toml | 3 +++
 clippy.toml  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 clippy.toml

diff --git a/.clippy.toml b/.clippy.toml
index b95e806aae..d82f64bbfd 100644
--- a/.clippy.toml
+++ b/.clippy.toml
@@ -1 +1,4 @@
 allow-mixed-uninlined-format-args = false
+disallowed-types = [
+    { path = "tower::util::BoxCloneService", reason = "Use our internal BoxCloneService which is Sync" },
+]
diff --git a/clippy.toml b/clippy.toml
deleted file mode 100644
index 625309989d..0000000000
--- a/clippy.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-disallowed-types = [
-    { path = "tower::util::BoxCloneService", reason = "Use our internal BoxCloneService which is Sync" },
-]