From 571ebb349b71736513135024a1cf48bd56f0c2fc Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Sun, 26 Nov 2023 14:39:25 -0500
Subject: [PATCH] Bump ignore to 0.4.21

This includes all the patches from #1420, so switch back to the official
release.
---
 Cargo.lock | 31 +++++++------------------------
 Cargo.toml |  5 +----
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f5b328b..28843dc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -327,7 +327,7 @@ dependencies = [
  "etcetera",
  "faccess",
  "filetime",
- "globset 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "globset",
  "humantime",
  "ignore",
  "jemallocator",
@@ -355,29 +355,11 @@ dependencies = [
  "windows-sys",
 ]
 
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
 [[package]]
 name = "globset"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
-dependencies = [
- "aho-corasick",
- "bstr",
- "fnv",
- "log",
- "regex",
-]
-
-[[package]]
-name = "globset"
-version = "0.4.13"
-source = "git+https://github.com/tavianator/ripgrep?branch=fd#43c6a11033ec5a66a73a1082ea71257e527d1de9"
+checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -432,11 +414,12 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.4.20"
-source = "git+https://github.com/tavianator/ripgrep?branch=fd#43c6a11033ec5a66a73a1082ea71257e527d1de9"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060"
 dependencies = [
  "crossbeam-deque",
- "globset 0.4.13 (git+https://github.com/tavianator/ripgrep?branch=fd)",
+ "globset",
  "log",
  "memchr",
  "regex-automata",
diff --git a/Cargo.toml b/Cargo.toml
index 0d18b20..4f2f464 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ version_check = "0.9"
 aho-corasick = "1.0"
 nu-ansi-term = "0.49"
 argmax = "0.3.1"
-ignore = "0.4.20"
+ignore = "0.4.21"
 regex = "1.9.6"
 regex-syntax = "0.8"
 ctrlc = "3.2"
@@ -50,9 +50,6 @@ crossbeam-channel = "0.5.8"
 clap_complete = {version = "4.4.4", optional = true}
 faccess = "0.2.4"
 
-[patch.crates-io]
-ignore = { git = "https://github.com/tavianator/ripgrep", branch = "fd" }
-
 [dependencies.clap]
 version = "4.4.7"
 features = ["suggestions", "color", "wrap_help", "cargo", "derive"]