Skip to content

Commit 421728f

Browse files
robertbastianrobertbastian
authored
Making icu_locid_macros into consts (#1631)
1 parent 4c700aa commit 421728f

File tree

94 files changed

+638
-1039
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+638
-1039
lines changed

‎Cargo.lock

Lines changed: 0 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ members = [
1313
"components/list",
1414
"components/locale_canonicalizer",
1515
"components/locid",
16-
"components/locid/macros",
1716
"components/plurals",
1817
"components/properties",
1918
"experimental/bies",

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ icu_provider_fs = "0.2"
3232
```
3333

3434
```rust
35-
use icu::locid::macros::langid;
35+
use icu::locid::langid;
3636
use icu::locid::Locale;
3737
use icu::datetime::{DateTimeFormat, mock::datetime::MockDateTime, options::length};
3838
use icu_provider_fs::FsDataProvider;

‎components/datetime/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ icu_provider = { version = "0.5", path = "../../provider/core" }
5454
icu_provider_adapters = { path = "../../provider/adapters" }
5555
icu_testdata = { version = "0.5", path = "../../provider/testdata", features = ["static"] }
5656
icu_calendar = { version = "0.5", path = "../calendar", features = ["serialize"] }
57-
icu_locid_macros = { version = "0.5", path = "../locid/macros" }
5857
serde = { version = "1.0", features = ["derive"] }
5958
serde_json = "1.0"
6059
bincode = "1.3"

‎components/datetime/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ used to quickly format any date and time provided.
1212

1313
```rust
1414
use icu::locid::Locale;
15-
use icu::locid::macros::langid;
15+
use icu::locid::langid;
1616
use icu::calendar::Gregorian;
1717
use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, mock::parse_gregorian_from_str, options::length};
1818

@@ -43,7 +43,7 @@ convert a [`options::length::Bag`] into a [`DateTimeFormatOptions::Length`].
4343

4444
```rust
4545
use icu::locid::Locale;
46-
use icu::locid::macros::langid;
46+
use icu::locid::langid;
4747
use icu::calendar::Gregorian;
4848
use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, options::length};
4949
let options = length::Bag {

‎components/datetime/examples/work_log.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ icu_benchmark_macros::static_setup!();
1212
use icu_calendar::{DateTime, Gregorian};
1313
use icu_datetime::mock::parse_gregorian_from_str;
1414
use icu_datetime::{options::length, DateTimeFormat};
15+
use icu_locid::langid;
1516
use icu_locid::Locale;
16-
use icu_locid_macros::langid;
1717

1818
const DATES_ISO: &[&str] = &[
1919
"2001-09-08T18:46:40:000",

‎components/datetime/src/datetime.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use crate::{date::DateTimeInput, CldrCalendar, DateTimeFormatError, FormattedDat
3333
///
3434
/// ```
3535
/// use icu::locid::Locale;
36-
/// use icu::locid::macros::langid;
36+
/// use icu::locid::langid;
3737
/// use icu::datetime::{DateTimeFormat, options::length};
3838
/// use icu::calendar::{DateTime, Gregorian};
3939
/// use icu_provider::inv::InvariantDataProvider;
@@ -70,7 +70,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
7070
///
7171
/// ```
7272
/// use icu::locid::Locale;
73-
/// use icu::locid::macros::langid;
73+
/// use icu::locid::langid;
7474
/// use icu::calendar::Gregorian;
7575
/// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
7676
/// use icu_provider::inv::InvariantDataProvider;
@@ -113,7 +113,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
113113
///
114114
/// ```
115115
/// use icu::locid::Locale;
116-
/// use icu::locid::macros::langid;
116+
/// use icu::locid::langid;
117117
/// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
118118
/// use icu::calendar::{DateTime, Gregorian};
119119
/// use icu_provider::inv::InvariantDataProvider;
@@ -149,7 +149,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
149149
///
150150
/// ```
151151
/// use icu::locid::Locale;
152-
/// use icu::locid::macros::langid;
152+
/// use icu::locid::langid;
153153
/// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
154154
/// use icu::calendar::{DateTime, Gregorian};
155155
/// use icu_provider::inv::InvariantDataProvider;
@@ -183,7 +183,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
183183
///
184184
/// ```
185185
/// use icu::locid::Locale;
186-
/// use icu::locid::macros::langid;
186+
/// use icu::locid::langid;
187187
/// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
188188
/// use icu::calendar::{DateTime, Gregorian};
189189
/// use icu_provider::inv::InvariantDataProvider;
@@ -216,7 +216,7 @@ impl<C: CldrCalendar> DateTimeFormat<C> {
216216
/// options::{components, length},
217217
/// DateTimeFormat, DateTimeFormatOptions,
218218
/// };
219-
/// use icu::locid::macros::langid;
219+
/// use icu::locid::langid;
220220
/// use icu::locid::Locale;
221221
///
222222
/// let options = DateTimeFormatOptions::Length(length::Bag {

‎components/datetime/src/format/datetime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ use writeable::Writeable;
3232
///
3333
/// ```
3434
/// use icu::locid::Locale;
35-
/// use icu::locid::macros::langid;
35+
/// use icu::locid::langid;
3636
/// use icu::datetime::{DateTimeFormat, DateTimeFormatOptions};
3737
/// use icu::calendar::{DateTime, Gregorian};
3838
/// use icu_provider::inv::InvariantDataProvider;

‎components/datetime/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
//!
1717
//! ```
1818
//! use icu::locid::Locale;
19-
//! use icu::locid::macros::langid;
19+
//! use icu::locid::langid;
2020
//! use icu::calendar::Gregorian;
2121
//! use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, mock::parse_gregorian_from_str, options::length};
2222
//!
@@ -47,7 +47,7 @@
4747
//!
4848
//! ```
4949
//! use icu::locid::Locale;
50-
//! use icu::locid::macros::langid;
50+
//! use icu::locid::langid;
5151
//! use icu::calendar::Gregorian;
5252
//! use icu::datetime::{DateTimeFormat, DateTimeFormatOptions, options::length};
5353
//! # let provider = icu_testdata::get_provider();

‎components/datetime/src/skeleton/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub use helpers::*;
1717
mod test {
1818
use super::reference::Skeleton;
1919
use super::*;
20-
use icu_locid_macros::langid;
20+
use icu_locid::langid;
2121
use icu_provider::prelude::*;
2222

2323
use crate::{

‎components/datetime/src/time_zone.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ where
6363
///
6464
/// ```
6565
/// use icu_locid::Locale;
66-
/// use icu::locid::macros::langid;
66+
/// use icu::locid::langid;
6767
/// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
6868
/// use icu_datetime::date::GmtOffset;
6969
/// use icu_datetime::mock::time_zone::MockTimeZone;
@@ -223,7 +223,7 @@ impl TimeZoneFormat {
223223
///
224224
/// ```
225225
/// use icu_locid::Locale;
226-
/// use icu::locid::macros::langid;
226+
/// use icu::locid::langid;
227227
/// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
228228
/// use icu_datetime::mock::time_zone::MockTimeZone;
229229
/// use icu_provider::inv::InvariantDataProvider;
@@ -313,7 +313,7 @@ impl TimeZoneFormat {
313313
///
314314
/// ```
315315
/// use icu_locid::Locale;
316-
/// use icu::locid::macros::langid;
316+
/// use icu::locid::langid;
317317
/// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
318318
/// use icu_datetime::date::GmtOffset;
319319
/// use icu_datetime::mock::time_zone::MockTimeZone;
@@ -351,7 +351,7 @@ impl TimeZoneFormat {
351351
///
352352
/// ```
353353
/// use icu_locid::Locale;
354-
/// use icu::locid::macros::langid;
354+
/// use icu::locid::langid;
355355
/// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
356356
/// use icu_datetime::date::GmtOffset;
357357
/// use icu_datetime::mock::time_zone::MockTimeZone;
@@ -390,7 +390,7 @@ impl TimeZoneFormat {
390390
///
391391
/// ```
392392
/// use icu_locid::Locale;
393-
/// use icu::locid::macros::langid;
393+
/// use icu::locid::langid;
394394
/// use icu_datetime::{TimeZoneFormat, TimeZoneFormatConfig};
395395
/// use icu_datetime::date::GmtOffset;
396396
/// use icu_datetime::mock::time_zone::MockTimeZone;

‎components/datetime/src/zoned_datetime.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ use crate::{
3737
///
3838
/// ```
3939
/// use icu::locid::Locale;
40-
/// use icu::locid::macros::langid;
40+
/// use icu::locid::langid;
4141
/// use icu::calendar::Gregorian;
4242
/// use icu::datetime::{ZonedDateTimeFormat, options::length};
4343
/// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -75,7 +75,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
7575
///
7676
/// ```
7777
/// use icu::locid::Locale;
78-
/// use icu::locid::macros::langid;
78+
/// use icu::locid::langid;
7979
/// use icu::calendar::Gregorian;
8080
/// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
8181
/// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -138,7 +138,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
138138
///
139139
/// ```
140140
/// use icu::locid::Locale;
141-
/// use icu::locid::macros::langid;
141+
/// use icu::locid::langid;
142142
/// use icu::calendar::Gregorian;
143143
/// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
144144
/// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -178,7 +178,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
178178
///
179179
/// ```
180180
/// use icu::locid::Locale;
181-
/// use icu::locid::macros::langid;
181+
/// use icu::locid::langid;
182182
/// use icu::calendar::Gregorian;
183183
/// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
184184
/// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;
@@ -216,7 +216,7 @@ impl<C: CldrCalendar> ZonedDateTimeFormat<C> {
216216
///
217217
/// ```
218218
/// use icu::locid::Locale;
219-
/// use icu::locid::macros::langid;
219+
/// use icu::locid::langid;
220220
/// use icu::calendar::Gregorian;
221221
/// use icu::datetime::{ZonedDateTimeFormat, DateTimeFormatOptions};
222222
/// use icu::datetime::mock::zoned_datetime::MockZonedDateTime;

‎components/datetime/tests/datetime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,8 @@ fn constructing_datetime_format_with_time_zone_pattern_symbols_is_err() {
538538
options::length::{Bag, Time},
539539
DateTimeFormatOptions,
540540
};
541+
use icu_locid::langid;
541542
use icu_locid::Locale;
542-
use icu_locid_macros::langid;
543543

544544
let options = DateTimeFormatOptions::Length(Bag {
545545
// Full has time-zone symbols.

‎components/datetime/tests/resolved_components.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ use icu_datetime::{
77
options::{components, length, preferences},
88
DateTimeFormat, DateTimeFormatOptions,
99
};
10+
use icu_locid::langid;
1011
use icu_locid::Locale;
11-
use icu_locid_macros::langid;
1212

1313
fn assert_resolved_components(options: &DateTimeFormatOptions, bag: &components::Bag) {
1414
let locale: Locale = langid!("en").into();

0 commit comments

Comments
 (0)