WIP: Migrate BlobProvider to ZeroMap

unicode-org · Sep 22, 2021 · 7e1feeb · 7e1feeb
1 parent fea0eb7
commit 7e1feeb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/provider/blob/Cargo.toml b/provider/blob/Cargo.toml
@@ -33,6 +33,7 @@ serde = { version = "1.0", default-features = false, features = ["alloc"] }
 postcard = { version = "0.7.0" }
 erased-serde = { version = "0.3", default-features = false, features = ["alloc"] }
 litemap = { version = "0.2.0", path = "../../utils/litemap/", features = ["serde"] }
+zerovec = { version = "0.3", path = "../../utils/zerovec", features = ["serde"] }
 writeable = { path = "../../utils/writeable" }
 
 # For the export feature

diff --git a/provider/blob/examples/simple.rs → provider/blob/examples/simple_static.rs b/provider/blob/examples/simple.rs → provider/blob/examples/simple_static.rs
diff --git a/provider/blob/src/blob_schema.rs b/provider/blob/src/blob_schema.rs
@@ -3,6 +3,9 @@
 // (online at: https://github.com/unicode-org/icu4x/blob/main/LICENSE ).
 
 use litemap::LiteMap;
+use zerovec::*;
+use alloc::string::String;
+use alloc::vec::Vec;
 
 /// A versioned Serde schema for ICU4X data blobs.
 #[derive(serde::Serialize, serde::Deserialize)]
@@ -14,7 +17,6 @@ pub enum BlobSchema<'data> {
 /// Version 1 of the ICU4X data blob schema.
 #[derive(serde::Serialize, serde::Deserialize)]
 pub struct BlobSchemaV1<'data> {
-    // TODO(#829): Use ZeroMap instead of LiteMap.
     #[serde(borrow)]
-    pub resources: LiteMap<&'data str, &'data [u8]>,
+    pub resources: ZeroMap<'data, String, Vec<u8>>,
 }
diff --git a/provider/blob/src/static_data_provider.rs b/provider/blob/src/static_data_provider.rs
@@ -68,7 +68,6 @@ impl StaticDataProvider {
         blob.resources
             .get(&*path)
             .ok_or(DataError::MissingResourceKey(req.resource_path.key))
-            .map(|v| *v)
     }
 }