Refactoring icu-data-provider crate.

unicode-org · Aug 7, 2020 · 2155838 · 2155838
1 parent 9a296e8
commit 2155838
Show file tree

Hide file tree

Showing 22 changed files with 1,083 additions and 521 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,6 @@
 
 members = [
     "components/data-provider",
-    "components/data-provider-json",
     "components/icu",
     "components/icu4x",
     "components/uniset",

diff --git a/components/data-provider-json/Cargo.toml b/components/data-provider-json/Cargo.toml
diff --git a/components/data-provider-json/README.md b/components/data-provider-json/README.md
diff --git a/components/data-provider-json/src/lib.rs b/components/data-provider-json/src/lib.rs
diff --git a/components/data-provider-json/src/schema.rs b/components/data-provider-json/src/schema.rs
diff --git a/components/data-provider-json/tests/test_file_io.rs b/components/data-provider-json/tests/test_file_io.rs
diff --git a/components/data-provider-json/tests/test_no_std.rs b/components/data-provider-json/tests/test_no_std.rs
diff --git a/components/data-provider-json/tests/testdata/all.json b/components/data-provider-json/tests/testdata/all.json
diff --git a/components/data-provider/Cargo.toml b/components/data-provider/Cargo.toml
@@ -15,28 +15,24 @@ include = [
 ]
 
 [features]
-default = ["std"]
-std = ["serde/std", "no-std-compat/std"]
+# Enable InvariantDataProvider, a locale-agnostic data provider.
+invariant = []
 
 [dependencies]
 icu-locale = { path = "../locale" }
+tinystr = "0.3"
+erased-serde = "0.3"
 
 [dependencies.smallstr]
-version = "0.2.0"
-default-features = false
+version = "0.2"
 features = ["serde"]
 
 [dependencies.downcast-rs]
-version = "1.1.1"
-
-[dependencies.async-trait]
-version = "0.1.30"
+version = "1.1"
 
 [dependencies.serde]
 version = "1.0"
-default-features = false
-features = ["derive", "alloc"]
+features = ["derive"]
 
-[dependencies.no-std-compat]
-version = "0.4.0"
-features = ["alloc"]
+[dev-dependencies]
+serde_json = "1.0"
diff --git a/components/data-provider/src/helpers.rs → ...onents/data-provider/src/cloneable_any.rs b/components/data-provider/src/helpers.rs → ...onents/data-provider/src/cloneable_any.rs
@@ -1,13 +1,16 @@
-use std::prelude::v1::*;
-
 use downcast_rs::impl_downcast;
 use downcast_rs::Downcast;
 use std::fmt::Debug;
 
+#[cfg(feature = "erased-serde")]
+use erased_serde;
+
 // Please do not to make this trait public, because it is easy to use incorrectly. It is fine as
 // an internal auto-implemented trait.
-pub(super) trait CloneableAny: Debug + Downcast {
+pub(super) trait CloneableAny: Debug + Downcast + erased_serde::Serialize {
     fn clone_into_box(&self) -> Box<dyn CloneableAny>;
+
+    fn as_serialize(&self) -> &dyn erased_serde::Serialize;
 }
 
 impl ToOwned for dyn CloneableAny {
@@ -19,10 +22,14 @@ impl ToOwned for dyn CloneableAny {
 }
 
 // Implement CloneableAny for all 'static types implementing Clone.
-impl<S: 'static + Clone + Debug> CloneableAny for S {
+impl<T: 'static + Clone + Debug + erased_serde::Serialize> CloneableAny for T {
     fn clone_into_box(&self) -> Box<dyn CloneableAny> {
         Box::new(self.clone())
     }
+
+    fn as_serialize(&self) -> &dyn erased_serde::Serialize {
+        self
+    }
 }
 
 // Adds the Downcast methods to all 'static types implementing CloneableAny.