From 6b940166fe4fef28ad8a2abd64c1f5dcf5ef2888 Mon Sep 17 00:00:00 2001
From: "Carol (Nichols || Goulding)" <carol.nichols@gmail.com>
Date: Wed, 1 Dec 2021 11:19:30 -0500
Subject: [PATCH] fix: Remove a deprecated memchr feature from the workspace
 crate

This was made possible by upgrading nom, which was using the deprecated
feature name. This will save us from pain in the future when the
deprecated feature is removed.

Unfortunately, this adds nom to the workspace hack crate, but we'll see
if it needs to stay there :)

Connects to #3117.
---
 Cargo.lock                | 1 +
 workspace-hack/Cargo.toml | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 173a430d05..4a72c9acb4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4991,6 +4991,7 @@ dependencies = [
  "indexmap",
  "log",
  "memchr",
+ "nom",
  "num-bigint 0.4.3",
  "num-integer",
  "num-traits",
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 7801279a17..353bd33bb8 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -27,7 +27,8 @@ hashbrown = { version = "0.11", features = ["ahash", "inline-more", "raw"] }
 hyper = { version = "0.14", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
 indexmap = { version = "1", default-features = false, features = ["std"] }
 log = { version = "0.4", default-features = false, features = ["std"] }
-memchr = { version = "2", features = ["std", "use_std"] }
+memchr = { version = "2", features = ["std"] }
+nom = { version = "7", features = ["alloc", "std"] }
 num-bigint = { version = "0.4", features = ["std"] }
 num-integer = { version = "0.1", default-features = false, features = ["i128", "std"] }
 num-traits = { version = "0.2", features = ["i128", "libm", "std"] }
@@ -59,7 +60,8 @@ getrandom = { version = "0.2", default-features = false, features = ["js", "js-s
 hashbrown = { version = "0.11", features = ["ahash", "inline-more", "raw"] }
 indexmap = { version = "1", default-features = false, features = ["std"] }
 log = { version = "0.4", default-features = false, features = ["std"] }
-memchr = { version = "2", features = ["std", "use_std"] }
+memchr = { version = "2", features = ["std"] }
+nom = { version = "7", features = ["alloc", "std"] }
 rand = { version = "0.8", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
 regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
 regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }