diff --git a/components/icu/examples/tui.rs b/components/icu/examples/tui.rs index e0f1f1d8662..b82cc073aae 100644 --- a/components/icu/examples/tui.rs +++ b/components/icu/examples/tui.rs @@ -13,7 +13,7 @@ fn print>(_input: T) { } fn main() { - let provider = FsDataProvider::try_new("./tests/fixtures/data/icu4x") + let provider = FsDataProvider::try_new("../../resources/testdata/data/json") .expect("Loading file from testdata directory"); let args: Vec = env::args().collect(); @@ -62,7 +62,7 @@ fn main() { { let en: LanguageIdentifier = "en".parse().expect("Failed to parse Language Identifier."); - let pr = PluralRules::try_new(en, PluralRuleType::Cardinal, &provider) + let pr = PluralRules::try_new(en, &provider, PluralRuleType::Cardinal) .expect("Failed to create PluralRules."); match pr.select(email_count) { diff --git a/components/icu/tests/fixtures/data/icu4x/dates/gregory@1/en.json b/components/icu/tests/fixtures/data/icu4x/dates/gregory@1/en.json deleted file mode 100644 index 62b3151792c..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/dates/gregory@1/en.json +++ /dev/null @@ -1 +0,0 @@ -{"symbols":{"months":{"format":{"abbreviated":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"wide":["January","February","March","April","May","June","July","August","September","October","November","December"]}},"weekdays":{"format":{"abbreviated":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"narrow":["S","M","T","W","T","F","S"],"short":["Su","Mo","Tu","We","Th","Fr","Sa"],"wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"]}},"day_periods":{"format":{"abbreviated":{"am":"AM","pm":"PM"},"narrow":{"am":"a","pm":"p"},"wide":{"am":"AM","pm":"PM"}},"stand_alone":{"narrow":{"am":"AM","pm":"PM"}}}},"patterns":{"date":{"full":"EEEE, MMMM d, y","long":"MMMM d, y","medium":"MMM d, y","short":"M/d/yy"},"time":{"full":"h:mm:ss a zzzz","long":"h:mm:ss a z","medium":"h:mm:ss a","short":"h:mm a"},"date_time":{"full":"{1} 'at' {0}","long":"{1} 'at' {0}","medium":"{1}, {0}","short":"{1}, {0}"}}} diff --git a/components/icu/tests/fixtures/data/icu4x/dates/gregory@1/pl.json b/components/icu/tests/fixtures/data/icu4x/dates/gregory@1/pl.json deleted file mode 100644 index f5c69ba1236..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/dates/gregory@1/pl.json +++ /dev/null @@ -1 +0,0 @@ -{"symbols":{"months":{"format":{"abbreviated":["sty","lut","mar","kwi","maj","cze","lip","sie","wrz","paź","lis","gru"],"narrow":["s","l","m","k","m","c","l","s","w","p","l","g"],"wide":["stycznia","lutego","marca","kwietnia","maja","czerwca","lipca","sierpnia","września","października","listopada","grudnia"]},"stand_alone":{"narrow":["S","L","M","K","M","C","L","S","W","P","L","G"],"wide":["styczeń","luty","marzec","kwiecień","maj","czerwiec","lipiec","sierpień","wrzesień","październik","listopad","grudzień"]}},"weekdays":{"format":{"abbreviated":["niedz.","pon.","wt.","śr.","czw.","pt.","sob."],"narrow":["n","p","w","ś","c","p","s"],"short":["nie","pon","wto","śro","czw","pią","sob"],"wide":["niedziela","poniedziałek","wtorek","środa","czwartek","piątek","sobota"]},"stand_alone":{"narrow":["N","P","W","Ś","C","P","S"]}},"day_periods":{"format":{"abbreviated":{"am":"AM","pm":"PM"},"narrow":{"am":"a","pm":"p"},"wide":{"am":"AM","pm":"PM"}}}},"patterns":{"date":{"full":"EEEE, d MMMM y","long":"d MMMM y","medium":"d MMM y","short":"dd.MM.y"},"time":{"full":"HH:mm:ss zzzz","long":"HH:mm:ss z","medium":"HH:mm:ss","short":"HH:mm"},"date_time":{"full":"{1} {0}","long":"{1} {0}","medium":"{1}, {0}","short":"{1}, {0}"}}} diff --git a/components/icu/tests/fixtures/data/icu4x/dates/manifest.json b/components/icu/tests/fixtures/data/icu4x/dates/manifest.json deleted file mode 100644 index a68a792a8e3..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/dates/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "aliasing": "NoAliases", - "syntax": "Json" -} diff --git a/components/icu/tests/fixtures/data/icu4x/manifest.json b/components/icu/tests/fixtures/data/icu4x/manifest.json deleted file mode 100644 index a68a792a8e3..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "aliasing": "NoAliases", - "syntax": "Json" -} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/ar.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/ar.json deleted file mode 100644 index 7b3c120389e..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/ar.json +++ /dev/null @@ -1 +0,0 @@ -{"zero":"n = 0","one":"n = 1","two":"n = 2","few":"n % 100 = 3..10","many":"n % 100 = 11..99"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/cs.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/cs.json deleted file mode 100644 index 68bb8dda2b9..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/cs.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"i = 1 and v = 0","few":"i = 2..4 and v = 0","many":"v != 0"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/de.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/de.json deleted file mode 100644 index 4ce936fa8e6..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/de.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"i = 1 and v = 0"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/en.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/en.json deleted file mode 100644 index 4ce936fa8e6..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/en.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"i = 1 and v = 0"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/es.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/es.json deleted file mode 100644 index a6f90482493..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/es.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"n = 1"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/fr.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/fr.json deleted file mode 100644 index 51be304b297..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/fr.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"i = 0,1"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/it.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/it.json deleted file mode 100644 index 4ce936fa8e6..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/it.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"i = 1 and v = 0"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/pl.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/pl.json deleted file mode 100644 index 8ef0fdc5b44..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/pl.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"i = 1 and v = 0","few":"v = 0 and i % 10 = 2..4 and i % 100 != 12..14","many":"v = 0 and i != 1 and i % 10 = 0..1 or v = 0 and i % 10 = 5..9 or v = 0 and i % 100 = 12..14"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/sk.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/sk.json deleted file mode 100644 index 68bb8dda2b9..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/sk.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"i = 1 and v = 0","few":"i = 2..4 and v = 0","many":"v != 0"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/uk.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/uk.json deleted file mode 100644 index 7a63d744146..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/uk.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"v = 0 and i % 10 = 1 and i % 100 != 11","few":"v = 0 and i % 10 = 2..4 and i % 100 != 12..14","many":"v = 0 and i % 10 = 0 or v = 0 and i % 10 = 5..9 or v = 0 and i % 100 = 11..14"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/zh.json b/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/zh.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/cardinal@1/zh.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/ar.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/ar.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/ar.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/cs.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/cs.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/cs.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/de.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/de.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/de.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/en.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/en.json deleted file mode 100644 index 62555fbefbd..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/en.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"n % 10 = 1 and n % 100 != 11","two":"n % 10 = 2 and n % 100 != 12","few":"n % 10 = 3 and n % 100 != 13"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/es.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/es.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/es.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/fr.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/fr.json deleted file mode 100644 index a6f90482493..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/fr.json +++ /dev/null @@ -1 +0,0 @@ -{"one":"n = 1"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/it.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/it.json deleted file mode 100644 index 75b1e4e10a3..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/it.json +++ /dev/null @@ -1 +0,0 @@ -{"many":"n = 11,8,80,800"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/pl.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/pl.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/pl.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/sk.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/sk.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/sk.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/uk.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/uk.json deleted file mode 100644 index 22830f0e248..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/uk.json +++ /dev/null @@ -1 +0,0 @@ -{"few":"n % 10 = 3 and n % 100 != 13"} diff --git a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/zh.json b/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/zh.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/components/icu/tests/fixtures/data/icu4x/plurals/ordinal@1/zh.json +++ /dev/null @@ -1 +0,0 @@ -{}