From fa866516c72c12cde267728f1d004d3ca533c8d7 Mon Sep 17 00:00:00 2001
From: boxbeam <instantiable@gmail.com>
Date: Fri, 9 Feb 2024 14:28:39 -0500
Subject: [PATCH] fix(core): Change to clippy lint (#1425)

---
 Makefile               |  2 +-
 rules/avoid-unwrap.yml | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 rules/avoid-unwrap.yml

diff --git a/Makefile b/Makefile
index b8e207ac2bc3..7edc4187b612 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 fix:
 	cargo machete --fix || true
 	cargo +nightly fmt
-	cargo +nightly clippy --fix --allow-dirty --allow-staged
+	cargo +nightly clippy --fix --allow-dirty --allow-staged -- -F clippy::unwrap_used
 
 fix-ui:
 	cd ee/tabby-ui && yarn format:write && yarn lint:fix
diff --git a/rules/avoid-unwrap.yml b/rules/avoid-unwrap.yml
deleted file mode 100644
index b76fdb09d20a..000000000000
--- a/rules/avoid-unwrap.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-id: avoid-unwrap-if-possible
-message: Avoid unwrap, consider return Result with meaningful error message.
-severity: warning
-language: rust
-ignores:
-- ./crates/aim-downloader/*
-- ./crates/tabby/tests/*
-rule:
-  all:
-    - any:
-        - kind: field_identifier
-          regex: ^unwrap$
-        - kind: identifier
-          regex: ^unwrap$
-    - not:
-        inside:
-          pattern: mod tests { $$$ }
-          stopBy: end
-    - not:
-        inside:
-          pattern: lazy_static! { $$$ }
-          stopBy: end
\ No newline at end of file