Adapt for https://gitlab.com/notriddle/stringdex/-/merge_requests/11/diffs?commit_id=5f470cc5639fab652379d9f336e79dc9c495444f

Also take in https://gitlab.com/notriddle/stringdex/-/merge_requests/12

Author: yotamofek

Cargo.lock

@@ -5274,7 +5274,7 @@ dependencies = [
 [[package]]
 name = "stringdex"
 version = "0.0.2"
-source = "git+https://gitlab.com/yotamofek/stringdex?rev=5dc67b8e6ce4f2d1f22c176ba881521167b950b1#5dc67b8e6ce4f2d1f22c176ba881521167b950b1"
+source = "git+https://gitlab.com/yotamofek/stringdex?rev=61a1cda4f942e6a6773e4b969aff7b26903a31f8#61a1cda4f942e6a6773e4b969aff7b26903a31f8"
 dependencies = [
  "stacker",
 ]

src/librustdoc/Cargo.toml

@@ -21,7 +21,7 @@ rustdoc-json-types = { path = "../rustdoc-json-types" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 smallvec = "1.8.1"
-stringdex = { git = "https://gitlab.com/yotamofek/stringdex", rev = "5dc67b8e6ce4f2d1f22c176ba881521167b950b1" }
+stringdex = { git = "https://gitlab.com/yotamofek/stringdex", rev = "61a1cda4f942e6a6773e4b969aff7b26903a31f8" }
 tempfile = "3"
 threadpool = "1.8.1"
 tracing = "0.1"

src/librustdoc/html/render/search_index.rs

@@ -3,7 +3,9 @@ mod serde;
 
 use std::collections::BTreeSet;
 use std::collections::hash_map::Entry;
+use std::io;
 use std::path::Path;
+use std::string::FromUtf8Error;
 
 use ::serde::de::{self, Deserializer, Error as _};
 use ::serde::ser::{SerializeSeq, Serializer};
@@ -95,21 +97,28 @@ impl SerializedSearchIndex {
         ) -> Result<(), Error> {
             let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
             let column_path = doc_root.join(format!("search.index/{column_name}/"));
+
+            struct Consumer<'col>(&'col mut Vec<String>);
+
+            impl<'col> stringdex_internals::Consumer for Consumer<'col> {
+                type Err = FromUtf8Error;
+
+                fn consume(&mut self, _id: u32, cell: &[u8]) -> Result<(), Self::Err> {
+                    self.0.push(String::from_utf8(cell.to_vec())?);
+                    Ok(())
+                }
+            }
+
             stringdex_internals::read_data_from_disk_column(
                 root_path,
                 column_name.as_bytes(),
                 column_path.clone(),
-                &mut |_id, item| {
-                    column.push(String::from_utf8(item.to_vec())?);
-                    Ok(())
-                },
-            )
-            .map_err(
-                |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error {
-                    file: column_path,
-                    error: format!("failed to read column from disk: {error}"),
-                },
+                &mut Consumer(column),
             )
+            .map_err(|error| Error {
+                file: column_path,
+                error: format!("failed to read column from disk: {error}"),
+            })
         }
         fn perform_read_serde(
             resource_suffix: &str,
@@ -119,25 +128,35 @@ impl SerializedSearchIndex {
         ) -> Result<(), Error> {
             let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
             let column_path = doc_root.join(format!("search.index/{column_name}/"));
+
+            struct Consumer<'col, T>(&'col mut Vec<Option<T>>);
+
+            impl<'col, T> stringdex_internals::Consumer for Consumer<'col, T>
+            where
+                T: for<'de> Deserialize<'de> + 'static,
+            {
+                type Err = serde_json::Error;
+
+                fn consume(&mut self, _id: u32, cell: &[u8]) -> Result<(), Self::Err> {
+                    if cell.is_empty() {
+                        self.0.push(None);
+                    } else {
+                        self.0.push(Some(serde_json::from_slice(cell)?));
+                    }
+                    Ok(())
+                }
+            }
+
             stringdex_internals::read_data_from_disk_column(
                 root_path,
                 column_name.as_bytes(),
                 column_path.clone(),
-                &mut |_id, item| {
-                    if item.is_empty() {
-                        column.push(None);
-                    } else {
-                        column.push(Some(serde_json::from_slice(item)?));
-                    }
-                    Ok(())
-                },
-            )
-            .map_err(
-                |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error {
-                    file: column_path,
-                    error: format!("failed to read column from disk: {error}"),
-                },
+                &mut Consumer(column),
             )
+            .map_err(|error| Error {
+                file: column_path,
+                error: format!("failed to read column from disk: {error}"),
+            })
         }
         fn perform_read_postings(
             resource_suffix: &str,
@@ -147,23 +166,30 @@ impl SerializedSearchIndex {
         ) -> Result<(), Error> {
             let root_path = doc_root.join(format!("search.index/root{resource_suffix}.js"));
             let column_path = doc_root.join(format!("search.index/{column_name}/"));
+
+            struct Consumer<'col>(&'col mut Vec<Vec<Vec<u32>>>);
+
+            impl<'col> stringdex_internals::Consumer for Consumer<'col> {
+                type Err = io::Error;
+
+                fn consume(&mut self, _id: u32, cell: &[u8]) -> Result<(), Self::Err> {
+                    let mut postings = Vec::new();
+                    encode::read_postings_from_string(&mut postings, cell);
+                    self.0.push(postings);
+                    Ok(())
+                }
+            }
+
             stringdex_internals::read_data_from_disk_column(
                 root_path,
                 column_name.as_bytes(),
                 column_path.clone(),
-                &mut |_id, buf| {
-                    let mut postings = Vec::new();
-                    encode::read_postings_from_string(&mut postings, buf);
-                    column.push(postings);
-                    Ok(())
-                },
-            )
-            .map_err(
-                |error: stringdex_internals::ReadDataError<Box<dyn std::error::Error>>| Error {
-                    file: column_path,
-                    error: format!("failed to read column from disk: {error}"),
-                },
+                &mut Consumer(column),
             )
+            .map_err(|error| Error {
+                file: column_path,
+                error: format!("failed to read column from disk: {error}"),
+            })
         }
 
         assert_eq!(names.len(), path_data.len());

src/tools/tidy/src/extdeps.rs

@@ -12,7 +12,7 @@ const ALLOWED_SOURCES: &[&str] = &[
     // This is `rust_team_data` used by `site` in src/tools/rustc-perf,
     r#""git+https://github.com/rust-lang/team#a5260e76d3aa894c64c56e6ddc8545b9a98043ec""#,
     // TMP:
-    r#""git+https://gitlab.com/yotamofek/stringdex?rev=5dc67b8e6ce4f2d1f22c176ba881521167b950b1#5dc67b8e6ce4f2d1f22c176ba881521167b950b1""#,
+    r#""git+https://gitlab.com/yotamofek/stringdex?rev=61a1cda4f942e6a6773e4b969aff7b26903a31f8#61a1cda4f942e6a6773e4b969aff7b26903a31f8""#,
 ];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the