revert tantivy upgrade a bit due to deprecation warning

Cargo.lock

@@ -3180,9 +3180,8 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "ownedbytes"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a059efb063b8f425b948e042e6b9bd85edfe60e913630ed727b23e2dfcc558"
+version = "0.6.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "stable_deref_trait",
 ]
@@ -4907,9 +4906,8 @@ dependencies = [
 
 [[package]]
 name = "tantivy"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8d0582f186c0a6d55655d24543f15e43607299425c5ad8352c242b914b31856"
+version = "0.22.0-dev"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "aho-corasick 1.1.2",
  "arc-swap",
@@ -4958,18 +4956,16 @@ dependencies = [
 
 [[package]]
 name = "tantivy-bitpacker"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284899c2325d6832203ac6ff5891b297fc5239c3dc754c5bc1977855b23c10df"
+version = "0.5.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "bitpacking",
 ]
 
 [[package]]
 name = "tantivy-columnar"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12722224ffbe346c7fec3275c699e508fd0d4710e629e933d5736ec524a1f44e"
+version = "0.2.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "downcast-rs",
  "fastdivide",
@@ -4983,9 +4979,8 @@ dependencies = [
 
 [[package]]
 name = "tantivy-common"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8019e3cabcfd20a1380b491e13ff42f57bb38bf97c3d5fa5c07e50816e0621f4"
+version = "0.6.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "async-trait",
  "byteorder 1.5.0",
@@ -5007,18 +5002,16 @@ dependencies = [
 
 [[package]]
 name = "tantivy-query-grammar"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "847434d4af57b32e309f4ab1b4f1707a6c566656264caa427ff4285c4d9d0b82"
+version = "0.21.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "nom",
 ]
 
 [[package]]
 name = "tantivy-sstable"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c69578242e8e9fc989119f522ba5b49a38ac20f576fc778035b96cc94f41f98e"
+version = "0.2.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "tantivy-bitpacker",
  "tantivy-common",
@@ -5028,9 +5021,8 @@ dependencies = [
 
 [[package]]
 name = "tantivy-stacker"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c56d6ff5591fc332739b3ce7035b57995a3ce29a93ffd6012660e0949c956ea8"
+version = "0.2.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "murmurhash32",
  "rand_distr",
@@ -5039,9 +5031,8 @@ dependencies = [
 
 [[package]]
 name = "tantivy-tokenizer-api"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0dcade25819a89cfe6f17d932c9cedff11989936bf6dd4f336d50392053b04"
+version = "0.2.0"
+source = "git+https://github.com/quickwit-oss/tantivy?rev=74940e9#74940e934568a08b08f4c31709986bc38e455812"
 dependencies = [
  "serde",
 ]

Cargo.toml

@@ -112,7 +112,7 @@ serde = { version = "1.0.137", features = ["rc", "derive"] }
 serde_json = "1.0.81"
 serde_urlencoded = "0.7.1"
 strum = { version = "0.26.2", features = ["derive"] }
-tantivy = { version = "0.22.0" }
+tantivy = { git = "https://github.com/quickwit-oss/tantivy", rev = "74940e9" }
 thiserror = "1.0.31"
 tikv-jemallocator = "0.5"
 tokenizers = "0.13.2"

assets/licenses.html

@@ -44,7 +44,7 @@
     
         <h2>Overview of licenses:</h2>
         <ul class="licenses-overview">
-            <li><a href="#Apache-2.0">Apache License 2.0</a> (397)</li>
+            <li><a href="#Apache-2.0">Apache License 2.0</a> (399)</li>
             <li><a href="#MIT">MIT License</a> (192)</li>
             <li><a href="#MPL-2.0">Mozilla Public License 2.0</a> (9)</li>
             <li><a href="#BSD-3-Clause">BSD 3-Clause &quot;New&quot; or &quot;Revised&quot; License</a> (7)</li>
@@ -7212,6 +7212,7 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/rust-lang/backtrace-rs ">backtrace 0.3.69</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64 0.13.1</a></li>
                     <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64 0.21.7</a></li>
+                    <li><a href=" https://github.com/marshallpierce/rust-base64 ">base64 0.22.0</a></li>
                     <li><a href=" https://github.com/bitflags/bitflags ">bitflags 1.3.2</a></li>
                     <li><a href=" https://github.com/bitflags/bitflags ">bitflags 2.4.2</a></li>
                     <li><a href=" https://github.com/fitzgen/bumpalo ">bumpalo 3.15.3</a></li>
@@ -7242,7 +7243,7 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/servo/rust-fnv ">fnv 1.0.7</a></li>
                     <li><a href=" https://github.com/servo/rust-url ">form_urlencoded 1.2.1</a></li>
                     <li><a href=" https://github.com/danburkert/fs2-rs ">fs2 0.4.3</a></li>
-                    <li><a href=" https://github.com/al8n/fs4-rs ">fs4 0.7.0</a></li>
+                    <li><a href=" https://github.com/al8n/fs4-rs ">fs4 0.8.2</a></li>
                     <li><a href=" https://github.com/servo/futf ">futf 0.1.5</a></li>
                     <li><a href=" https://github.com/gimli-rs/gimli ">gimli 0.28.1</a></li>
                     <li><a href=" https://github.com/rust-lang/glob ">glob 0.3.1</a></li>
@@ -7263,6 +7264,7 @@ limitations under the License.</pre>
                     <li><a href=" https://github.com/mitsuhiko/insta ">insta 1.36.1</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools 0.10.5</a></li>
                     <li><a href=" https://github.com/rust-itertools/itertools ">itertools 0.11.0</a></li>
+                    <li><a href=" https://github.com/rust-itertools/itertools ">itertools 0.12.1</a></li>
                     <li><a href=" https://github.com/bluss/rust-itertools ">itertools 0.8.2</a></li>
                     <li><a href=" https://github.com/bluss/rust-itertools ">itertools 0.9.0</a></li>
                     <li><a href=" https://github.com/dtolnay/itoa ">itoa 0.4.8</a></li>
@@ -12305,7 +12307,7 @@ THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://crates.io/crates/bitpacking ">bitpacking 0.8.4</a></li>
+                    <li><a href=" https://github.com/quickwit-oss/bitpacking ">bitpacking 0.9.2</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2016 Paul Masurel
 
@@ -12447,7 +12449,7 @@ THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRES
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/quickwit-oss/tantivy ">tantivy 0.21.0</a></li>
+                    <li><a href=" https://github.com/quickwit-oss/tantivy ">tantivy 0.22.0-dev</a></li>
                 </ul>
                 <pre class="license-text">Copyright (c) 2018 by the project authors, as listed in the AUTHORS file. 
 
@@ -14004,7 +14006,7 @@ THE SOFTWARE.
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/tantivy-search/fst ">tantivy-fst 0.4.0</a></li>
+                    <li><a href=" https://github.com/quickwit-inc/fst ">tantivy-fst 0.5.0</a></li>
                 </ul>
                 <pre class="license-text">The MIT License (MIT)
 

crates/core/src/webgraph/store.rs

@@ -101,14 +101,12 @@ impl EdgeStoreWriter {
     pub fn finalize(mut self) -> EdgeStore {
         self.edges.sort_unstable();
 
-        let s = EdgeStore::build(
+        EdgeStore::build(
             self.path,
             self.compression,
             self.reversed,
             self.edges.into_iter().map(|e| e.edge),
-        );
-
-        s
+        )
     }
 }