Skip to content

Commit a9101ef

Browse files
authored
Remove unused data markers from datetime crate (#6447)
1 parent a0fe12e commit a9101ef

File tree

6 files changed

+630
-595
lines changed

6 files changed

+630
-595
lines changed

components/datetime/src/provider/calendar/mod.rs

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -17,72 +17,6 @@ pub use symbols::*;
1717

1818
size_test!(DateLengths, date_lengths_v1_size, 224);
1919

20-
icu_provider::data_marker!(
21-
/// `BuddhistDateLengthsV1`
22-
BuddhistDateLengthsV1,
23-
DateLengths<'static>
24-
);
25-
icu_provider::data_marker!(
26-
/// `ChineseDateLengthsV1`
27-
ChineseDateLengthsV1,
28-
DateLengths<'static>
29-
);
30-
icu_provider::data_marker!(
31-
/// `CopticDateLengthsV1`
32-
CopticDateLengthsV1,
33-
DateLengths<'static>
34-
);
35-
icu_provider::data_marker!(
36-
/// `DangiDateLengthsV1`
37-
DangiDateLengthsV1,
38-
DateLengths<'static>
39-
);
40-
icu_provider::data_marker!(
41-
/// `EthiopianDateLengthsV1`
42-
EthiopianDateLengthsV1,
43-
DateLengths<'static>
44-
);
45-
icu_provider::data_marker!(
46-
/// `GregorianDateLengthsV1`
47-
GregorianDateLengthsV1,
48-
DateLengths<'static>
49-
);
50-
icu_provider::data_marker!(
51-
/// `HebrewDateLengthsV1`
52-
HebrewDateLengthsV1,
53-
DateLengths<'static>
54-
);
55-
icu_provider::data_marker!(
56-
/// `IndianDateLengthsV1`
57-
IndianDateLengthsV1,
58-
DateLengths<'static>
59-
);
60-
icu_provider::data_marker!(
61-
/// `HijriDateLengthsV1`
62-
HijriDateLengthsV1,
63-
DateLengths<'static>
64-
);
65-
icu_provider::data_marker!(
66-
/// `JapaneseDateLengthsV1`
67-
JapaneseDateLengthsV1,
68-
DateLengths<'static>
69-
);
70-
icu_provider::data_marker!(
71-
/// `JapaneseExtendedDateLengthsV1`
72-
JapaneseExtendedDateLengthsV1,
73-
DateLengths<'static>
74-
);
75-
icu_provider::data_marker!(
76-
/// `PersianDateLengthsV1`
77-
PersianDateLengthsV1,
78-
DateLengths<'static>
79-
);
80-
icu_provider::data_marker!(
81-
/// `RocDateLengthsV1`
82-
RocDateLengthsV1,
83-
DateLengths<'static>
84-
);
85-
8620
/// Pattern data for dates.
8721
#[doc = date_lengths_v1_size!()]
8822
///
@@ -110,12 +44,6 @@ icu_provider::data_struct!(
11044
#[cfg(feature = "datagen")]
11145
);
11246

113-
icu_provider::data_marker!(
114-
/// `TimeLengthsV1`
115-
TimeLengthsV1,
116-
TimeLengths<'static>
117-
);
118-
11947
size_test!(TimeLengths, time_lengths_v1_size, 264);
12048

12149
/// Pattern data for times.

components/datetime/src/provider/calendar/symbols.rs

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -13,72 +13,6 @@ use potential_utf::PotentialUtf8;
1313
use tinystr::{tinystr, TinyStr4};
1414
use zerovec::ZeroMap;
1515

16-
icu_provider::data_marker!(
17-
/// `BuddhistDateSymbolsV1`
18-
BuddhistDateSymbolsV1,
19-
DateSymbols<'static>
20-
);
21-
icu_provider::data_marker!(
22-
/// `ChineseDateSymbolsV1`
23-
ChineseDateSymbolsV1,
24-
DateSymbols<'static>
25-
);
26-
icu_provider::data_marker!(
27-
/// `CopticDateSymbolsV1`
28-
CopticDateSymbolsV1,
29-
DateSymbols<'static>
30-
);
31-
icu_provider::data_marker!(
32-
/// `DangiDateSymbolsV1`
33-
DangiDateSymbolsV1,
34-
DateSymbols<'static>
35-
);
36-
icu_provider::data_marker!(
37-
/// `EthiopianDateSymbolsV1`
38-
EthiopianDateSymbolsV1,
39-
DateSymbols<'static>
40-
);
41-
icu_provider::data_marker!(
42-
/// `GregorianDateSymbolsV1`
43-
GregorianDateSymbolsV1,
44-
DateSymbols<'static>
45-
);
46-
icu_provider::data_marker!(
47-
/// `HebrewDateSymbolsV1`
48-
HebrewDateSymbolsV1,
49-
DateSymbols<'static>
50-
);
51-
icu_provider::data_marker!(
52-
/// `IndianDateSymbolsV1`
53-
IndianDateSymbolsV1,
54-
DateSymbols<'static>
55-
);
56-
icu_provider::data_marker!(
57-
/// `HijriDateSymbolsV1`
58-
HijriDateSymbolsV1,
59-
DateSymbols<'static>
60-
);
61-
icu_provider::data_marker!(
62-
/// `JapaneseDateSymbolsV1`
63-
JapaneseDateSymbolsV1,
64-
DateSymbols<'static>
65-
);
66-
icu_provider::data_marker!(
67-
/// `JapaneseExtendedDateSymbolsV1`
68-
JapaneseExtendedDateSymbolsV1,
69-
DateSymbols<'static>
70-
);
71-
icu_provider::data_marker!(
72-
/// `PersianDateSymbolsV1`
73-
PersianDateSymbolsV1,
74-
DateSymbols<'static>
75-
);
76-
icu_provider::data_marker!(
77-
/// `RocDateSymbolsV1`
78-
RocDateSymbolsV1,
79-
DateSymbols<'static>
80-
);
81-
8216
size_test!(DateSymbols, date_symbols_v1_size, 3792);
8317

8418
/// Symbol data for the months, weekdays, and eras needed to format a date.
@@ -113,12 +47,6 @@ icu_provider::data_struct!(
11347
#[cfg(feature = "datagen")]
11448
);
11549

116-
icu_provider::data_marker!(
117-
/// `TimeSymbolsV1`
118-
TimeSymbolsV1,
119-
TimeSymbols<'static>
120-
);
121-
12250
size_test!(TimeSymbols, time_symbols_v1_size, 768);
12351

12452
/// Symbol data for the day periods needed to format a time.
@@ -296,26 +224,6 @@ macro_rules! symbols {
296224
#[cfg_attr(feature = "serde", serde(borrow))]
297225
pub stand_alone: Option<StandAloneWidths<'data>>,
298226
}
299-
300-
impl<'data> Contexts<'data> {
301-
/// Convenience function to return stand-alone abbreviated as an `Option<&>`.
302-
pub(crate) fn stand_alone_abbreviated(&self) -> Option<&Symbols<'data>> {
303-
self.stand_alone.as_ref().and_then(|x| x.abbreviated.as_ref())
304-
}
305-
/// Convenience function to return stand-alone wide as an `Option<&>`.
306-
pub(crate) fn stand_alone_wide(&self) -> Option<&Symbols<'data>> {
307-
self.stand_alone.as_ref().and_then(|x| x.wide.as_ref())
308-
}
309-
/// Convenience function to return stand-alone narrow as an `Option<&>`.
310-
pub(crate) fn stand_alone_narrow(&self) -> Option<&Symbols<'data>> {
311-
self.stand_alone.as_ref().and_then(|x| x.narrow.as_ref())
312-
}
313-
/// Convenience function to return stand-alone short as an `Option<&>`.
314-
#[allow(dead_code)] // not all symbols have a short variant
315-
pub(crate) fn stand_alone_short(&self) -> Option<&Symbols<'data>> {
316-
self.stand_alone.as_ref().and_then(|x| x.short.as_ref())
317-
}
318-
}
319227
}
320228
};
321229
}

0 commit comments

Comments
 (0)