Adapt for https://gitlab.com/notriddle/stringdex/-/merge_requests/11#note_2877222677

Author: yotamofek

Cargo.lock

@@ -5274,7 +5274,7 @@ dependencies = [
 [[package]]
 name = "stringdex"
 version = "0.0.2"
-source = "git+https://gitlab.com/yotamofek/stringdex?rev=61a1cda4f942e6a6773e4b969aff7b26903a31f8#61a1cda4f942e6a6773e4b969aff7b26903a31f8"
+source = "git+https://gitlab.com/yotamofek/stringdex?rev=a1812aefdb3dce2bb85d9ec52a6e53d8eefa3c4b#a1812aefdb3dce2bb85d9ec52a6e53d8eefa3c4b"
 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 = "61a1cda4f942e6a6773e4b969aff7b26903a31f8" }
+stringdex = { git = "https://gitlab.com/yotamofek/stringdex", rev = "a1812aefdb3dce2bb85d9ec52a6e53d8eefa3c4b" }
 tempfile = "3"
 threadpool = "1.8.1"
 tracing = "0.1"

src/librustdoc/html/render/search_index.rs

@@ -98,22 +98,16 @@ impl SerializedSearchIndex {
             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(())
-                }
-            }
+            let mut consume = |_, cell: &[u8]| {
+                column.push(String::from_utf8(cell.to_vec())?);
+                Ok::<_, FromUtf8Error>(())
+            };
 
             stringdex_internals::read_data_from_disk_column(
                 root_path,
                 column_name.as_bytes(),
                 column_path.clone(),
-                &mut Consumer(column),
+                &mut consume,
             )
             .map_err(|error| Error {
                 file: column_path,
@@ -129,29 +123,20 @@ impl SerializedSearchIndex {
             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(())
+            let mut consume = |_, cell: &[u8]| {
+                if cell.is_empty() {
+                    column.push(None);
+                } else {
+                    column.push(Some(serde_json::from_slice(cell)?));
                 }
-            }
+                Ok::<_, serde_json::Error>(())
+            };
 
             stringdex_internals::read_data_from_disk_column(
                 root_path,
                 column_name.as_bytes(),
                 column_path.clone(),
-                &mut Consumer(column),
+                &mut consume,
             )
             .map_err(|error| Error {
                 file: column_path,
@@ -167,15 +152,13 @@ impl SerializedSearchIndex {
             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> {
+            fn consumer(
+                column: &mut Vec<Vec<Vec<u32>>>,
+            ) -> impl FnMut(u32, &[u8]) -> io::Result<()> {
+                |_, cell| {
                     let mut postings = Vec::new();
                     encode::read_postings_from_string(&mut postings, cell);
-                    self.0.push(postings);
+                    column.push(postings);
                     Ok(())
                 }
             }
@@ -184,7 +167,7 @@ impl SerializedSearchIndex {
                 root_path,
                 column_name.as_bytes(),
                 column_path.clone(),
-                &mut Consumer(column),
+                &mut consumer(column),
             )
             .map_err(|error| Error {
                 file: column_path,

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=61a1cda4f942e6a6773e4b969aff7b26903a31f8#61a1cda4f942e6a6773e4b969aff7b26903a31f8""#,
+    r#""git+https://gitlab.com/yotamofek/stringdex?rev=a1812aefdb3dce2bb85d9ec52a6e53d8eefa3c4b#a1812aefdb3dce2bb85d9ec52a6e53d8eefa3c4b""#,
 ];
 
 /// Checks for external package sources. `root` is the path to the directory that contains the