Switch to use ICU4X

Author: zbraniecki

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "fluent-syntax",
     "fluent-bundle",
@@ -16,16 +17,17 @@ exclude = [
 
 [workspace.dependencies]
 criterion = "0.3"
-fluent-langneg = "0.13"
+fluent-langneg = "0.14"
 futures = "0.3"
 iai = "0.1"
-intl_pluralrules = "7.0.1"
 rustc-hash = "1"
 serde = "1.0"
 serde_json = "1.0"
 thiserror = "1.0"
 tokio = "1.0"
-unic-langid = "0.9"
+icu_locid = "1.4"
+icu_plurals = { version = "1.4", features = ["experimental"] }
+icu_provider = "1.4"
 
 fluent-bundle = { path = "fluent-bundle" }
 fluent-fallback = { path = "fluent-fallback" }

fluent-bundle/Cargo.toml

@@ -26,11 +26,13 @@ include = [
 ]
 
 [dependencies]
-fluent-langneg.workspace = true
+fluent-langneg = "0.14"
 fluent-syntax.workspace = true
-intl_pluralrules.workspace = true
 rustc-hash.workspace = true
-unic-langid.workspace = true
+icu_locid.workspace = true
+icu_plurals.workspace = true
+icu_provider.workspace = true
+fixed_decimal = { version = "0.5.5", features = ["ryu"] }
 intl-memoizer = { path = "../intl-memoizer" }
 self_cell = "0.10"
 smallvec = "1"
@@ -39,12 +41,12 @@ smallvec = "1"
 criterion.workspace = true
 iai.workspace = true
 serde = { workspace = true, features = ["derive"]}
-unic-langid = { workspace = true, features = ["macros"] }
 rand = "0.8"
 serde_yaml = "0.8"
 
 [features]
-default = []
+default = ["icu_provider/sync"]
+sync = ["icu_provider/sync"]
 all-benchmarks = []
 
 [[bench]]

fluent-bundle/README.md

@@ -23,7 +23,7 @@ Usage
 
 ```rust
 use fluent_bundle::{FluentBundle, FluentResource};
-use unic_langid::langid;
+use icu_locid::langid;
 
 fn main() {
     let ftl_string = "hello-world = Hello, world!".to_owned();

fluent-bundle/benches/resolver.rs

@@ -10,7 +10,7 @@ use std::rc::Rc;
 
 use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};
 use fluent_syntax::ast;
-use unic_langid::langid;
+use icu_locid::langid;
 
 fn read_file(path: &str) -> Result<String, io::Error> {
     let mut f = File::open(path)?;

fluent-bundle/benches/resolver_iai.rs

@@ -1,6 +1,6 @@
 use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};
 use fluent_syntax::ast;
-use unic_langid::{langid, LanguageIdentifier};
+use icu_locid::{langid, LanguageIdentifier};
 
 const LANG_EN: LanguageIdentifier = langid!("en");
 

fluent-bundle/examples/custom_formatter.rs

@@ -2,7 +2,7 @@
 // to format selected types of values.
 //
 // This allows users to plug their own number formatter to Fluent.
-use unic_langid::LanguageIdentifier;
+use icu_locid::LanguageIdentifier;
 
 use fluent_bundle::memoizer::MemoizerKind;
 use fluent_bundle::types::{FluentNumber, FluentNumberOptions};

fluent-bundle/examples/custom_type.rs

@@ -9,8 +9,8 @@
 // Lastly, we'll also create a new formatter which will be memoizable.
 //
 // The type and its options are modelled after ECMA402 Intl.DateTimeFormat.
+use icu_locid::LanguageIdentifier;
 use intl_memoizer::Memoizable;
-use unic_langid::LanguageIdentifier;
 
 use fluent_bundle::types::FluentType;
 use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};

fluent-bundle/examples/external_arguments.rs

@@ -1,5 +1,5 @@
 use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};
-use unic_langid::langid;
+use icu_locid::langid;
 
 fn main() {
     let ftl_string = String::from(

fluent-bundle/examples/functions.rs

@@ -1,5 +1,5 @@
 use fluent_bundle::{FluentBundle, FluentResource, FluentValue};
-use unic_langid::langid;
+use icu_locid::langid;
 
 fn main() {
     // We define the resources here so that they outlive

fluent-bundle/examples/simple-app.rs

@@ -19,14 +19,14 @@
 //! default one.
 use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};
 use fluent_langneg::{negotiate_languages, NegotiationStrategy};
+use icu_locid::{langid, LanguageIdentifier};
 use std::env;
 use std::fs;
 use std::fs::File;
 use std::io;
 use std::io::prelude::*;
 use std::path::Path;
 use std::str::FromStr;
-use unic_langid::{langid, LanguageIdentifier};
 
 /// We need a generic file read helper function to
 /// read the localization resource file.