Making icu_locid_macros into consts (#1631)

unicode-org · Mar 29, 2022 · 421728f · 421728f
1 parent 4c700aa
commit 421728f
Show file tree

Hide file tree

Showing 94 changed files with 638 additions and 1,039 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,6 @@ members = [
     "components/list",
     "components/locale_canonicalizer",
     "components/locid",
-    "components/locid/macros",
     "components/plurals",
     "components/properties",
     "experimental/bies",

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ icu_provider_fs = "0.2"
 ```
 
 ```rust
-use icu::locid::macros::langid;
+use icu::locid::langid;
 use icu::locid::Locale;
 use icu::datetime::{DateTimeFormat, mock::datetime::MockDateTime, options::length};
 use icu_provider_fs::FsDataProvider;

diff --git a/components/datetime/Cargo.toml b/components/datetime/Cargo.toml
@@ -54,7 +54,6 @@ icu_provider = { version = "0.5", path = "../../provider/core" }
 icu_provider_adapters = { path = "../../provider/adapters" }
 icu_testdata = { version = "0.5", path = "../../provider/testdata", features = ["static"] }
 icu_calendar = { version = "0.5", path = "../calendar", features = ["serialize"] }
-icu_locid_macros = { version = "0.5", path = "../locid/macros" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 bincode = "1.3"

diff --git a/components/datetime/README.md b/components/datetime/README.md
@@ -12,7 +12,7 @@ used to quickly format any date and time provided.
 
 ```rust
 use icu::locid::Locale;
-use icu::locid::macros::langid;
+use icu::locid::langid;
 use icu::calendar::Gregorian;
 use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, mock::parse_gregorian_from_str, options::length};
 
@@ -43,7 +43,7 @@ convert a [`options::length::Bag`] into a [`DateTimeFormatOptions::Length`].
 
 ```rust
 use icu::locid::Locale;
-use icu::locid::macros::langid;
+use icu::locid::langid;
 use icu::calendar::Gregorian;
 use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, options::length};
 let options = length::Bag {

diff --git a/components/datetime/examples/work_log.rs b/components/datetime/examples/work_log.rs
@@ -12,8 +12,8 @@ icu_benchmark_macros::static_setup!();
 use icu_calendar::{DateTime, Gregorian};
 use icu_datetime::mock::parse_gregorian_from_str;
 use icu_datetime::{options::length, DateTimeFormat};
+use icu_locid::langid;
 use icu_locid::Locale;
-use icu_locid_macros::langid;
 
 const DATES_ISO: &[&str] = &[
     "2001-09-08T18:46:40:000",

diff --git a/components/datetime/src/datetime.rs b/components/datetime/src/datetime.rs
@@ -33,7 +33,7 @@ use crate::{date::DateTimeInput, CldrCalendar, DateTimeFormatError, FormattedDat
 ///
 /// ```
 /// use icu::locid::Locale;
-/// use icu::locid::macros::langid;
+/// use icu::locid::langid;
 /// use icu::datetime::{DateTimeFormat, options::length};
 /// use icu::calendar::{DateTime, Gregorian};
 /// use icu_provider::inv::InvariantDataProvider;
@@ -70,7 +70,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::calendar::Gregorian;
     /// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
     /// use icu_provider::inv::InvariantDataProvider;
@@ -113,7 +113,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
     /// use icu::calendar::{DateTime, Gregorian};
     /// use icu_provider::inv::InvariantDataProvider;
@@ -149,7 +149,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
     /// use icu::calendar::{DateTime, Gregorian};
     /// use icu_provider::inv::InvariantDataProvider;
@@ -183,7 +183,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
     /// use icu::calendar::{DateTime, Gregorian};
     /// use icu_provider::inv::InvariantDataProvider;
@@ -216,7 +216,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
     ///     options::{components, length},
     ///     DateTimeFormat, DateTimeFormatOptions,
     /// };
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::locid::Locale;
     ///
     /// let options = DateTimeFormatOptions::Length(length::Bag {

diff --git a/components/datetime/src/format/datetime.rs b/components/datetime/src/format/datetime.rs
@@ -32,7 +32,7 @@ use writeable::Writeable;
 ///
 /// ```
 /// use icu::locid::Locale;
-/// use icu::locid::macros::langid;
+/// use icu::locid::langid;
 /// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
 /// use icu::calendar::{DateTime, Gregorian};
 /// use icu_provider::inv::InvariantDataProvider;

diff --git a/components/datetime/src/lib.rs b/components/datetime/src/lib.rs
@@ -16,7 +16,7 @@
 //!
 //! ```
 //! use icu::locid::Locale;
-//! use icu::locid::macros::langid;
+//! use icu::locid::langid;
 //! use icu::calendar::Gregorian;
 //! use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, mock::parse_gregorian_from_str, options::length};
 //!
@@ -47,7 +47,7 @@
 //!
 //! ```
 //! use icu::locid::Locale;
-//! use icu::locid::macros::langid;
+//! use icu::locid::langid;
 //! use icu::calendar::Gregorian;
 //! use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, options::length};
 //! # let provider = icu_testdata::get_provider();

diff --git a/components/datetime/src/skeleton/mod.rs b/components/datetime/src/skeleton/mod.rs
@@ -17,7 +17,7 @@ pub use helpers::*;
 mod test {
     use super::reference::Skeleton;
     use super::*;
-    use icu_locid_macros::langid;
+    use icu_locid::langid;
     use icu_provider::prelude::*;
 
     use crate::{

diff --git a/components/datetime/src/time_zone.rs b/components/datetime/src/time_zone.rs
@@ -63,7 +63,7 @@ where
 ///
 /// ```
 /// use icu_locid::Locale;
-/// use icu::locid::macros::langid;
+/// use icu::locid::langid;
 /// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
 /// use icu_datetime::date::GmtOffset;
 /// use icu_datetime::mock::time_zone::MockTimeZone;
@@ -223,7 +223,7 @@ impl TimeZoneFormat {
     ///
     /// ```
     /// use icu_locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
     /// use icu_datetime::mock::time_zone::MockTimeZone;
     /// use icu_provider::inv::InvariantDataProvider;
@@ -313,7 +313,7 @@ impl TimeZoneFormat {
     ///
     /// ```
     /// use icu_locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
     /// use icu_datetime::date::GmtOffset;
     /// use icu_datetime::mock::time_zone::MockTimeZone;
@@ -351,7 +351,7 @@ impl TimeZoneFormat {
     ///
     /// ```
     /// use icu_locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
     /// use icu_datetime::date::GmtOffset;
     /// use icu_datetime::mock::time_zone::MockTimeZone;
@@ -390,7 +390,7 @@ impl TimeZoneFormat {
     ///
     /// ```
     /// use icu_locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
     /// use icu_datetime::date::GmtOffset;
     /// use icu_datetime::mock::time_zone::MockTimeZone;

diff --git a/components/datetime/src/zoned_datetime.rs b/components/datetime/src/zoned_datetime.rs
@@ -37,7 +37,7 @@ use crate::{
 ///
 /// ```
 /// use icu::locid::Locale;
-/// use icu::locid::macros::langid;
+/// use icu::locid::langid;
 /// use icu::calendar::Gregorian;
 /// use icu::datetime::{ZonedDateTimeFormat, options::length};
 /// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -75,7 +75,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::calendar::Gregorian;
     /// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
     /// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -138,7 +138,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::calendar::Gregorian;
     /// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
     /// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -178,7 +178,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::calendar::Gregorian;
     /// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
     /// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -216,7 +216,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
     ///
     /// ```
     /// use icu::locid::Locale;
-    /// use icu::locid::macros::langid;
+    /// use icu::locid::langid;
     /// use icu::calendar::Gregorian;
     /// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
     /// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;

diff --git a/components/datetime/tests/datetime.rs b/components/datetime/tests/datetime.rs
@@ -538,8 +538,8 @@ fn constructing_datetime_format_with_time_zone_pattern_symbols_is_err() {
         options::length::{Bag, Time},
         DateTimeFormatOptions,
     };
+    use icu_locid::langid;
     use icu_locid::Locale;
-    use icu_locid_macros::langid;
 
     let options = DateTimeFormatOptions::Length(Bag {
         // Full has time-zone symbols.

diff --git a/components/datetime/tests/resolved_components.rs b/components/datetime/tests/resolved_components.rs
@@ -7,8 +7,8 @@ use icu_datetime::{
     options::{components, length, preferences},
     DateTimeFormat, DateTimeFormatOptions,
 };
+use icu_locid::langid;
 use icu_locid::Locale;
-use icu_locid_macros::langid;
 
 fn assert_resolved_components(options: &DateTimeFormatOptions, bag: &components::Bag) {
     let locale: Locale = langid!("en").into();