From 607395ad5608afdaeeec7d68eea66b1ac8e52cbf Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Sat, 17 Apr 2021 18:03:04 +0200
Subject: [PATCH] workaround: move to git version temporarily

Revert this or bump to the release 0.6.3 as soon as it's available.
---
 Cargo.lock              | 16 +++++++---------
 Cargo.toml              |  8 ++++----
 src/checker/nlprules.rs |  1 -
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 45b77e15..d3c9cb5c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1081,9 +1081,8 @@ dependencies = [
 
 [[package]]
 name = "nlprule"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "565328bcad06bfe66d02d592537aeab4da1b7e52a4cb28b5eea00c12a137ae89"
+version = "0.6.3-pre"
+source = "git+https://github.com/bminixhofer/nlprule.git?branch=once_cell#bf3de41bf0f9d7e9c2aa1b6e601e0f1a0a6614eb"
 dependencies = [
  "aho-corasick",
  "bimap",
@@ -1098,8 +1097,8 @@ dependencies = [
  "half",
  "itertools 0.10.0",
  "lazy_static",
- "lazycell",
  "log",
+ "once_cell",
  "onig",
  "rayon",
  "rayon-cond",
@@ -1116,9 +1115,8 @@ dependencies = [
 
 [[package]]
 name = "nlprule-build"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "171c32e77adcfedf2d24d91c9fd439c0cf1d4f8d5b1662984fe815d9b2841e05"
+version = "0.6.3-pre"
+source = "git+https://github.com/bminixhofer/nlprule.git?branch=once_cell#bf3de41bf0f9d7e9c2aa1b6e601e0f1a0a6614eb"
 dependencies = [
  "directories",
  "flate2",
@@ -1730,9 +1728,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustls"
-version = "0.19.0"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b"
+checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
 dependencies = [
  "base64",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index 82cfbc29..5e7249ab 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ include = [
 ]
 
 [build-dependencies]
-nlprule-build = { version = "0.6.2", optional = true }
+nlprule-build = { git = "https://github.com/bminixhofer/nlprule.git", branch = "once_cell",  optional = true }
 # compress the nlprule artifacts to be under the 10 MB limit
 # that cargo enforces
 xz2 = "0.1"
@@ -70,7 +70,7 @@ hunspell-rs = { version = "0.3", optional = true }
 fd-lock = { version = "2", optional = true }
 
 # full grammar check, but also tokenization and disambiguation
-nlprule = { version = "0.6.2", optional = true }
+nlprule = { git = "https://github.com/bminixhofer/nlprule.git", branch = "once_cell",  optional = true }
 
 [dev-dependencies]
 # for stripping ansi color codes
@@ -82,8 +82,8 @@ serde_plain = "0.3"
 [features]
 default = ["hunspell", "nlprules"]
 
-# deprecated! pending removal
-hunspell = ["hunspell-rs/bundled", "fd-lock"]
+# hunspell uses the segmenter provided by nlprules
+hunspell = ["hunspell-rs/bundled", "fd-lock", "nlprules"]
 nlprules = ["nlprule/regex-fancy", "nlprule-build"]
 
 all = ["hunspell", "nlprules"]
diff --git a/src/checker/nlprules.rs b/src/checker/nlprules.rs
index 03851611..7a1aebf4 100644
--- a/src/checker/nlprules.rs
+++ b/src/checker/nlprules.rs
@@ -29,7 +29,6 @@ impl Checker for NlpRulesChecker {
         let rules = super::rules(config.override_tokenizer.as_ref())?;
 
         let rules = rules
-            .into_iter()
             .into_iter()
             .filter(|rule| {
                 match rule