unicode-org · zbraniecki · Oct 9, 2020 · sffc · Oct 9, 2020 · sffc
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -8,6 +8,6 @@
 # List of components with at least two owners as specified in docs/crate-ownership.
 
 components/locale/               @zbraniecki @nciric
-components/pluralrules           @zbraniecki @sffc
-components/data-provider/        @sffc
-components/data-provider-json/   @sffc
+components/plurals/              @zbraniecki @sffc
+components/data_provider/        @sffc
+components/data_provider_json/   @sffc
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,16 +1,16 @@
 [workspace]
 
 members = [
-    "components/cldr-json-data-provider",
-    "components/data-provider",
-    "components/fs-data-provider",
+    "components/cldr_json_data_provider",
+    "components/data_provider",
+    "components/fs_data_provider",
     "components/icu",
     "components/icu4x",
     "components/uniset",
     "components/locale",
     "components/locale/macros",
-    "components/pluralrules",
+    "components/plurals",
     "components/datetime",
     "resources/testdata",
-    "utils/fixed-decimal",
+    "utils/fixed_decimal",
 ]
diff --git a/...onents/cldr-json-data-provider/Cargo.toml → ...onents/cldr_json_data_provider/Cargo.toml b/...onents/cldr-json-data-provider/Cargo.toml → ...onents/cldr_json_data_provider/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "icu-cldr-json-data-provider"
+name = "icu_cldr_json_data_provider"
 description = "Data provider that reads from a CLDR JSON data source"
 version = "0.0.1"
 authors = ["The ICU4X Project Developers"]
@@ -15,9 +15,9 @@ include = [
 ]
 
 [dependencies]
-icu-data-provider = { path = "../data-provider" }
-icu-locale = { path = "../locale" }
-icu-pluralrules = { path = "../pluralrules" }
+icu_data_provider = { path = "../data_provider" }
+icu_locale = { path = "../locale" }
+icu_plurals = { path = "../plurals" }
 json = "0.12"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

diff --git a/components/cldr-json-data-provider/README.md → components/cldr_json_data_provider/README.md b/components/cldr-json-data-provider/README.md → components/cldr_json_data_provider/README.md
diff --git a/...ldr-json-data-provider/src/cldr_langid.rs → ...ldr_json_data_provider/src/cldr_langid.rs b/...ldr-json-data-provider/src/cldr_langid.rs → ...ldr_json_data_provider/src/cldr_langid.rs
diff --git a/...cldr-json-data-provider/src/cldr_paths.rs → ...cldr_json_data_provider/src/cldr_paths.rs b/...cldr-json-data-provider/src/cldr_paths.rs → ...cldr_json_data_provider/src/cldr_paths.rs
diff --git a/...vider/src/download/cldr_paths_download.rs → ...vider/src/download/cldr_paths_download.rs b/...vider/src/download/cldr_paths_download.rs → ...vider/src/download/cldr_paths_download.rs
diff --git a/...-json-data-provider/src/download/error.rs → ..._json_data_provider/src/download/error.rs b/...-json-data-provider/src/download/error.rs → ..._json_data_provider/src/download/error.rs
diff --git a/...son-data-provider/src/download/io_util.rs → ...son_data_provider/src/download/io_util.rs b/...son-data-provider/src/download/io_util.rs → ...son_data_provider/src/download/io_util.rs
diff --git a/...dr-json-data-provider/src/download/mod.rs → ...dr_json_data_provider/src/download/mod.rs b/...dr-json-data-provider/src/download/mod.rs → ...dr_json_data_provider/src/download/mod.rs
diff --git a/...ents/cldr-json-data-provider/src/error.rs → ...ents/cldr_json_data_provider/src/error.rs b/...ents/cldr-json-data-provider/src/error.rs → ...ents/cldr_json_data_provider/src/error.rs
diff --git a/...onents/cldr-json-data-provider/src/lib.rs → ...onents/cldr_json_data_provider/src/lib.rs b/...onents/cldr-json-data-provider/src/lib.rs → ...onents/cldr_json_data_provider/src/lib.rs
@@ -1,4 +1,4 @@
-//! `icu-cldr-json-data-provider` is one of the [`ICU4X`] components.
+//! `icu_cldr_json_data_provider` is one of the [`ICU4X`] components.
 //!
 //! It contains implementations of the [`DataProvider`] interface based on the JSON files
 //! shipped by CLDR. You create a CldrPaths and then pass it into CldrJsonDataProvider.

diff --git a/...nts/cldr-json-data-provider/src/reader.rs → ...nts/cldr_json_data_provider/src/reader.rs b/...nts/cldr-json-data-provider/src/reader.rs → ...nts/cldr_json_data_provider/src/reader.rs
diff --git a/...ts/cldr-json-data-provider/src/support.rs → ...ts/cldr_json_data_provider/src/support.rs b/...ts/cldr-json-data-provider/src/support.rs → ...ts/cldr_json_data_provider/src/support.rs
diff --git a/...json-data-provider/src/transform/dates.rs → ...json_data_provider/src/transform/dates.rs b/...json-data-provider/src/transform/dates.rs → ...json_data_provider/src/transform/dates.rs
diff --git a/...r-json-data-provider/src/transform/mod.rs → ...r_json_data_provider/src/transform/mod.rs b/...r-json-data-provider/src/transform/mod.rs → ...r_json_data_provider/src/transform/mod.rs
diff --git a/...on-data-provider/src/transform/plurals.rs → ...on_data_provider/src/transform/plurals.rs b/...on-data-provider/src/transform/plurals.rs → ...on_data_provider/src/transform/plurals.rs
@@ -5,7 +5,7 @@ use crate::CldrPaths;
 use icu_data_provider::iter::DataEntryCollection;
 use icu_data_provider::prelude::*;
 use icu_data_provider::structs::plurals::*;
-use icu_pluralrules::rules::{parse, serialize};
+use icu_plurals::rules::{parse, serialize};
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::marker::PhantomData;

diff --git a/...vider/tests/testdata/cs-ca-gregorian.json → ...vider/tests/testdata/cs-ca-gregorian.json b/...vider/tests/testdata/cs-ca-gregorian.json → ...vider/tests/testdata/cs-ca-gregorian.json
diff --git a/...on-data-provider/tests/testdata/dummy.pdf → ...on_data_provider/tests/testdata/dummy.pdf b/...on-data-provider/tests/testdata/dummy.pdf → ...on_data_provider/tests/testdata/dummy.pdf
diff --git a/...on-data-provider/tests/testdata/dummy.zip → ...on_data_provider/tests/testdata/dummy.zip b/...on-data-provider/tests/testdata/dummy.zip → ...on_data_provider/tests/testdata/dummy.zip
diff --git a/...ider/tests/testdata/haw-ca-gregorian.json → ...ider/tests/testdata/haw-ca-gregorian.json b/...ider/tests/testdata/haw-ca-gregorian.json → ...ider/tests/testdata/haw-ca-gregorian.json
diff --git a/...data-provider/tests/testdata/plurals.json → ...data_provider/tests/testdata/plurals.json b/...data-provider/tests/testdata/plurals.json → ...data_provider/tests/testdata/plurals.json
diff --git a/components/data-provider/Cargo.toml → components/data_provider/Cargo.toml b/components/data-provider/Cargo.toml → components/data_provider/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "icu-data-provider"
+name = "icu_data_provider"
 description = "Trait and struct definitions for the ICU data provider"
 version = "0.0.1"
 authors = ["The ICU4X Project Developers"]
@@ -19,7 +19,7 @@ include = [
 invariant = []
 
 [dependencies]
-icu-locale = { path = "../locale" }
+icu_locale = { path = "../locale" }
 tinystr = "0.3"
 erased-serde = "0.3"
 smallstr = { version = "0.2", features = ["serde"] }

diff --git a/components/data-provider/README.md → components/data_provider/README.md b/components/data-provider/README.md → components/data_provider/README.md
diff --git a/...onents/data-provider/src/cloneable_any.rs → ...onents/data_provider/src/cloneable_any.rs b/...onents/data-provider/src/cloneable_any.rs → ...onents/data_provider/src/cloneable_any.rs
diff --git a/components/data-provider/src/data_entry.rs → components/data_provider/src/data_entry.rs b/components/data-provider/src/data_entry.rs → components/data_provider/src/data_entry.rs
diff --git a/components/data-provider/src/data_key.rs → components/data_provider/src/data_key.rs b/components/data-provider/src/data_key.rs → components/data_provider/src/data_key.rs
diff --git a/...onents/data-provider/src/data_provider.rs → ...onents/data_provider/src/data_provider.rs b/...onents/data-provider/src/data_provider.rs → ...onents/data_provider/src/data_provider.rs
diff --git a/components/data-provider/src/error.rs → components/data_provider/src/error.rs b/components/data-provider/src/error.rs → components/data_provider/src/error.rs
diff --git a/components/data-provider/src/invariant.rs → components/data_provider/src/invariant.rs b/components/data-provider/src/invariant.rs → components/data_provider/src/invariant.rs
diff --git a/components/data-provider/src/iter.rs → components/data_provider/src/iter.rs b/components/data-provider/src/iter.rs → components/data_provider/src/iter.rs
diff --git a/components/data-provider/src/lib.rs → components/data_provider/src/lib.rs b/components/data-provider/src/lib.rs → components/data_provider/src/lib.rs
@@ -1,4 +1,4 @@
-//! `icu-data-provider` is one of the [`ICU4X`] components.
+//! `icu_data_provider` is one of the [`ICU4X`] components.
 //!
 //! It defines traits and structs for transmitting data through the ICU4X locale data pipeline.
 //! The primary trait is [`DataProvider`]. It has one method, which transforms a [`Request`] into

diff --git a/...onents/data-provider/src/structs/dates.rs → ...onents/data_provider/src/structs/dates.rs b/...onents/data-provider/src/structs/dates.rs → ...onents/data_provider/src/structs/dates.rs
diff --git a/...ents/data-provider/src/structs/decimal.rs → ...ents/data_provider/src/structs/decimal.rs b/...ents/data-provider/src/structs/decimal.rs → ...ents/data_provider/src/structs/decimal.rs
diff --git a/components/data-provider/src/structs/mod.rs → components/data_provider/src/structs/mod.rs b/components/data-provider/src/structs/mod.rs → components/data_provider/src/structs/mod.rs
diff --git a/...ents/data-provider/src/structs/plurals.rs → ...ents/data_provider/src/structs/plurals.rs b/...ents/data-provider/src/structs/plurals.rs → ...ents/data_provider/src/structs/plurals.rs
diff --git a/...nts/data-provider/tests/json_warehouse.rs → ...nts/data_provider/tests/json_warehouse.rs b/...nts/data-provider/tests/json_warehouse.rs → ...nts/data_provider/tests/json_warehouse.rs
diff --git a/components/datetime/Cargo.toml b/components/datetime/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "icu-datetime"
+name = "icu_datetime"
 description = "API for managing Unicode Language and Locale Identifiers"
 version = "0.0.1"
 authors = ["The ICU4X Project Developers"]
@@ -15,13 +15,13 @@ include = [
 ]
 
 [dependencies]
-icu-locale = { path = "../locale" }
-icu-data-provider = { path = "../data-provider" }
+icu_locale = { path = "../locale" }
+icu_data_provider = { path = "../data_provider" }
 
 [dev-dependencies]
 criterion = "0.3"
-icu-data-provider = { path = "../data-provider", features = ["invariant"] }
-icu-testdata = { path = "../../resources/testdata" }
+icu_data_provider = { path = "../data_provider", features = ["invariant"] }
+icu_testdata = { path = "../../resources/testdata" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 

diff --git a/components/datetime/src/lib.rs b/components/datetime/src/lib.rs
@@ -1,4 +1,4 @@
-//! `icu-datetime` is one of the [`ICU4X`] components.
+//! `icu_datetime` is one of the [`ICU4X`] components.
 //!
 //! It is a core API for formatting date and time to user readable textual representation.
 //!
@@ -64,7 +64,7 @@ use pattern::Pattern;
 use provider::DateTimeDates;
 use std::borrow::Cow;
 
-/// `DateTimeFormat` is the main structure of the `icu-datetime` component.
+/// `DateTimeFormat` is the main structure of the `icu_datetime` component.
 /// When constructed, it uses data from the `DataProvider`, selected `LanguageIdentifier` and provided options to
 /// collect all data necessary to format any dates into that locale.
 ///

diff --git a/components/fs-data-provider/Cargo.toml → components/fs_data_provider/Cargo.toml b/components/fs-data-provider/Cargo.toml → components/fs_data_provider/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "icu-fs-data-provider"
+name = "icu_fs_data_provider"
 description = "ICU4X data provider that reads from structured data files"
 version = "0.0.1"
 authors = ["The ICU4X Project Developers"]
@@ -15,8 +15,8 @@ include = [
 ]
 
 [dependencies]
-icu-data-provider = { path = "../data-provider" }
-icu-locale = { path = "../locale", features = ["serde"] }
+icu_data_provider = { path = "../data_provider" }
+icu_locale = { path = "../locale", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 
@@ -26,12 +26,12 @@ log = { version = "0.4", optional = true }
 
 # Dependencies for the binary
 clap = { version = "2.33", optional = true }
-icu-cldr-json-data-provider = { path = "../cldr-json-data-provider", features = ["download"], optional = true }
+icu_cldr_json_data_provider = { path = "../cldr_json_data_provider", features = ["download"], optional = true }
 simple_logger = { version = "1.10", optional = true }
 
 [features]
-export = ["erased-serde", "icu-data-provider/invariant", "log"]
-export-bin = ["export", "clap", "icu-cldr-json-data-provider", "simple_logger"]
+export = ["erased-serde", "icu_data_provider/invariant", "log"]
+export-bin = ["export", "clap", "icu_cldr_json_data_provider", "simple_logger"]
 
 [[bin]]
 name = "icu4x-cldr-export"

diff --git a/components/fs-data-provider/README.md → components/fs_data_provider/README.md b/components/fs-data-provider/README.md → components/fs_data_provider/README.md
diff --git a/...ata-provider/src/bin/icu4x-cldr-export.rs → ...ata_provider/src/bin/icu4x-cldr-export.rs b/...ata-provider/src/bin/icu4x-cldr-export.rs → ...ata_provider/src/bin/icu4x-cldr-export.rs
diff --git a/components/fs-data-provider/src/error.rs → components/fs_data_provider/src/error.rs b/components/fs-data-provider/src/error.rs → components/fs_data_provider/src/error.rs
diff --git a/...s/fs-data-provider/src/export/aliasing.rs → ...s/fs_data_provider/src/export/aliasing.rs b/...s/fs-data-provider/src/export/aliasing.rs → ...s/fs_data_provider/src/export/aliasing.rs
diff --git a/...s-data-provider/src/export/fs_exporter.rs → ...s_data_provider/src/export/fs_exporter.rs b/...s-data-provider/src/export/fs_exporter.rs → ...s_data_provider/src/export/fs_exporter.rs
diff --git a/...onents/fs-data-provider/src/export/mod.rs → ...onents/fs_data_provider/src/export/mod.rs b/...onents/fs-data-provider/src/export/mod.rs → ...onents/fs_data_provider/src/export/mod.rs
diff --git a/...s-data-provider/src/export/serializers.rs → ...s_data_provider/src/export/serializers.rs b/...s-data-provider/src/export/serializers.rs → ...s_data_provider/src/export/serializers.rs
diff --git a/.../fs-data-provider/src/fs_data_provider.rs → .../fs_data_provider/src/fs_data_provider.rs b/.../fs-data-provider/src/fs_data_provider.rs → .../fs_data_provider/src/fs_data_provider.rs
diff --git a/components/fs-data-provider/src/lib.rs → components/fs_data_provider/src/lib.rs b/components/fs-data-provider/src/lib.rs → components/fs_data_provider/src/lib.rs
@@ -1,4 +1,4 @@
-//! `icu-fs-data-provider` is one of the [`ICU4X`] components.
+//! `icu_fs_data_provider` is one of the [`ICU4X`] components.
 //!
 //! It reads ICU4X data files from the filesystem in a given directory. It can also export data to
 //! the filesystem via an iterable data provider (see the `export` module).

diff --git a/components/fs-data-provider/src/manifest.rs → components/fs_data_provider/src/manifest.rs b/components/fs-data-provider/src/manifest.rs → components/fs_data_provider/src/manifest.rs
diff --git a/...ts/fs-data-provider/tests/test_file_io.rs → ...ts/fs_data_provider/tests/test_file_io.rs b/...ts/fs-data-provider/tests/test_file_io.rs → ...ts/fs_data_provider/tests/test_file_io.rs
diff --git a/components/icu/Cargo.toml b/components/icu/Cargo.toml
@@ -15,10 +15,10 @@ include = [
 ]
 
 [dependencies]
-icu-datetime = { path = "../datetime" }
-icu-locale = { path = "../locale" }
-icu-pluralrules = { path = "../pluralrules" }
-icu-unicodeset = { path = "../uniset" }
+icu_datetime = { path = "../datetime" }
+icu_locale = { path = "../locale" }
+icu_plurals = { path = "../plurals" }
+icu_uniset = { path = "../uniset" }
 
 [dev-dependencies]
-icu-testdata = { path = "../../resources/testdata" }
+icu_testdata = { path = "../../resources/testdata" }
diff --git a/components/icu/src/lib.rs b/components/icu/src/lib.rs
@@ -62,6 +62,6 @@ pub use icu_datetime as datetime;
 #[doc(inline)]
 pub use icu_locale as locale;
 #[doc(inline)]
-pub use icu_pluralrules as plurals;
+pub use icu_plurals as plurals;
 #[doc(inline)]
-pub use icu_unicodeset as uniset;
+pub use icu_uniset as uniset;
diff --git a/components/locale/Cargo.toml b/components/locale/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "icu-locale"
+name = "icu_locale"
 description = "API for managing Unicode Language and Locale Identifiers"
 version = "0.0.1"
 authors = ["The ICU4X Project Developers"]

diff --git a/components/locale/README.md b/components/locale/README.md
@@ -2,7 +2,7 @@
 
 ICU4X is a set of internationalization components for Unicode.
 
-# Status [![crates.io](http://meritbadge.herokuapp.com/icu-locale)](https://crates.io/crates/icu-locale)
+# Status [![crates.io](http://meritbadge.herokuapp.com/icu_locale)](https://crates.io/crates/icu_locale)
 
 The project is in an incubation period.
 

diff --git a/components/locale/macros/Cargo.toml b/components/locale/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
-name = "icu-locale-macros"
-description = "proc-macros for icu-locale"
+name = "icu_locale_macros"
+description = "proc-macros for icu_locale"
 version = "0.0.1"
 authors = ["The ICU4X Project Developers"]
 edition = "2018"
@@ -18,5 +18,5 @@ include = [
 proc_macro = true
 
 [dependencies]
-icu-locale = { version = "0.0.1", path = "../" }
+icu_locale = { version = "0.0.1", path = "../" }
 tinystr = "0.3"
diff --git a/components/locale/src/lib.rs b/components/locale/src/lib.rs
@@ -1,4 +1,4 @@
-//! `icu-locale` is one of the [`ICU4X`] components.
+//! `icu_locale` is one of the [`ICU4X`] components.
 //!
 //! It is a core API for parsing, manipulating, and serializing Unicode Language
 //! and Locale Identifiers.

diff --git a/components/pluralrules/Cargo.toml → components/plurals/Cargo.toml b/components/pluralrules/Cargo.toml → components/plurals/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "icu-pluralrules"
+name = "icu_plurals"
 description = "Unicode Plural Rules categorizer for numeric input."
 version = "0.0.1"
 authors = ["The ICU4X Project Developers"]
@@ -15,17 +15,17 @@ include = [
 ]
 
 [dependencies]
-icu-locale = { path = "../locale" }
-icu-data-provider = { path = "../data-provider" }
-fixed-decimal = { path = "../../utils/fixed-decimal" }
+icu_locale = { path = "../locale" }
+icu_data_provider = { path = "../data_provider" }
+fixed_decimal = { path = "../../utils/fixed_decimal" }
 
 [dev-dependencies]
 criterion = "0.3"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = {version = "1.0" }
-icu-locale = { path = "../locale", features = ["serde"] }
-icu-data-provider = { path = "../data-provider", features = ["invariant"] }
-icu-testdata = { path = "../../resources/testdata" }
+icu_locale = { path = "../locale", features = ["serde"] }
+icu_data_provider = { path = "../data_provider", features = ["invariant"] }
+icu_testdata = { path = "../../resources/testdata" }
 
 [features]
 default = []

diff --git a/...nents/pluralrules/benches/fixtures/mod.rs → components/plurals/benches/fixtures/mod.rs b/...nents/pluralrules/benches/fixtures/mod.rs → components/plurals/benches/fixtures/mod.rs
@@ -1,5 +1,5 @@
 use icu_locale::LanguageIdentifier;
-use icu_pluralrules::PluralCategory;
+use icu_plurals::PluralCategory;
 
 use serde::Deserialize;
 

diff --git a/...pluralrules/benches/fixtures/numbers.json → ...nts/plurals/benches/fixtures/numbers.json b/...pluralrules/benches/fixtures/numbers.json → ...nts/plurals/benches/fixtures/numbers.json
diff --git a/...pluralrules/benches/fixtures/plurals.json → ...nts/plurals/benches/fixtures/plurals.json b/...pluralrules/benches/fixtures/plurals.json → ...nts/plurals/benches/fixtures/plurals.json
diff --git a/...onents/pluralrules/benches/helpers/mod.rs → components/plurals/benches/helpers/mod.rs b/...onents/pluralrules/benches/helpers/mod.rs → components/plurals/benches/helpers/mod.rs
diff --git a/components/pluralrules/benches/operands.rs → components/plurals/benches/operands.rs b/components/pluralrules/benches/operands.rs → components/plurals/benches/operands.rs
@@ -3,7 +3,7 @@ mod helpers;
 
 use criterion::{black_box, criterion_group, criterion_main, Criterion};
 use fixed_decimal::FixedDecimal;
-use icu_pluralrules::PluralOperands;
+use icu_plurals::PluralOperands;
 use std::convert::TryInto;
 
 fn operands(c: &mut Criterion) {

diff --git a/components/pluralrules/benches/parser.rs → components/plurals/benches/parser.rs b/components/pluralrules/benches/parser.rs → components/plurals/benches/parser.rs
@@ -7,7 +7,7 @@ use icu_data_provider::{icu_data_key, structs, DataEntry, DataProvider, DataRequ
 use std::borrow::Cow;
 
 fn parser(c: &mut Criterion) {
-    use icu_pluralrules::rules::parse_condition;
+    use icu_plurals::rules::parse_condition;
 
     let plurals_data = helpers::get_plurals_data();
 
@@ -53,7 +53,7 @@ fn parser(c: &mut Criterion) {
 
     #[cfg(feature = "bench")]
     c.bench_function("parser/lex", |b| {
-        use icu_pluralrules::rules::Lexer;
+        use icu_plurals::rules::Lexer;
         b.iter(|| {
             for rule in &rules {
                 let _ = Lexer::new(black_box(rule.as_bytes())).count();

diff --git a/...onents/pluralrules/benches/pluralrules.rs → components/plurals/benches/pluralrules.rs b/...onents/pluralrules/benches/pluralrules.rs → components/plurals/benches/pluralrules.rs
@@ -3,7 +3,7 @@ mod helpers;
 
 use criterion::{criterion_group, criterion_main, Criterion};
 
-use icu_pluralrules::{PluralRuleType, PluralRules};
+use icu_plurals::{PluralRuleType, PluralRules};
 
 fn pluralrules(c: &mut Criterion) {
     let plurals_data = helpers::get_plurals_data();

diff --git a/...s/pluralrules/examples/elevator_floors.rs → ...nents/plurals/examples/elevator_floors.rs b/...s/pluralrules/examples/elevator_floors.rs → ...nents/plurals/examples/elevator_floors.rs
@@ -1,7 +1,7 @@
-// An example application which uses icu_pluralrules to construct a correct
+// An example application which uses icu_plurals to construct a correct
 // sentence for English based on the numerical value in Ordinal category.
 use icu_locale::LanguageIdentifier;
-use icu_pluralrules::{PluralCategory, PluralRuleType, PluralRules};
+use icu_plurals::{PluralCategory, PluralRuleType, PluralRules};
 
 const VALUES: &[usize] = &[0, 2, 25, 1, 3, 2, 4, 10, 7, 0];
 

diff --git a/...nts/pluralrules/examples/unread_emails.rs → components/plurals/examples/unread_emails.rs b/...nts/pluralrules/examples/unread_emails.rs → components/plurals/examples/unread_emails.rs
@@ -1,7 +1,7 @@
-// An example application which uses icu_pluralrules to construct a correct
+// An example application which uses icu_plurals to construct a correct
 // sentence for English based on the numerical value in Cardinal category.
 use icu_locale::LanguageIdentifier;
-use icu_pluralrules::{PluralCategory, PluralRuleType, PluralRules};
+use icu_plurals::{PluralCategory, PluralRuleType, PluralRules};
 
 const VALUES: &[usize] = &[0, 2, 25, 1, 3, 2, 4, 10, 7, 0];
 

diff --git a/components/pluralrules/src/data.rs → components/plurals/src/data.rs b/components/pluralrules/src/data.rs → components/plurals/src/data.rs
@@ -4,8 +4,8 @@
 //!
 //! ```
 //! use icu_locale::LanguageIdentifier;
-//! use icu_pluralrules::{PluralCategory, PluralRuleType, PluralOperands};
-//! use icu_pluralrules::data::{PluralRuleList, RulesSelector};
+//! use icu_plurals::{PluralCategory, PluralRuleType, PluralOperands};
+//! use icu_plurals::data::{PluralRuleList, RulesSelector};
 //! use icu_data_provider::prelude::*;
 //! use icu_data_provider::{InvariantDataProvider, structs};
 //! use std::borrow::Cow;

diff --git a/components/pluralrules/src/error.rs → components/plurals/src/error.rs b/components/pluralrules/src/error.rs → components/plurals/src/error.rs