Skip to content

Commit 0c85284

Browse files
Removing skeleton marker from registry (#5058)
1 parent d1c9d50 commit 0c85284

File tree

298 files changed

+10
-15117
lines changed

Some content is hidden

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

298 files changed

+10
-15117
lines changed

components/datetime/src/provider/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ pub mod neo;
4444
/// </div>
4545
pub struct Baked;
4646

47+
#[cfg(feature = "experimental")]
48+
include!("../../tests/data/datetime_skeletons_v1.rs.data");
49+
4750
#[cfg(feature = "compiled_data")]
4851
#[allow(unused_imports)]
4952
const _: () = {
@@ -79,8 +82,6 @@ const _: () = {
7982
impl_datetime_persian_datesymbols_v1!(Baked);
8083
impl_datetime_roc_datelengths_v1!(Baked);
8184
impl_datetime_roc_datesymbols_v1!(Baked);
82-
#[cfg(feature = "experimental")]
83-
impl_datetime_skeletons_v1!(Baked);
8485
impl_datetime_timelengths_v1!(Baked);
8586
impl_datetime_timesymbols_v1!(Baked);
8687
impl_time_zone_exemplar_cities_v1!(Baked);
@@ -90,6 +91,9 @@ const _: () = {
9091
impl_time_zone_specific_long_v1!(Baked);
9192
impl_time_zone_specific_short_v1!(Baked);
9293

94+
#[cfg(feature = "experimental")]
95+
impl_datetime_skeletons_v1!(Baked);
96+
9397
#[cfg(feature = "experimental")]
9498
impl_datetime_symbols_weekdays_v1!(Baked);
9599
#[cfg(feature = "experimental")]
@@ -250,8 +254,6 @@ pub const MARKERS: &[DataMarkerInfo] = &[
250254
time_zones::MetazoneSpecificNamesShortV1Marker::INFO,
251255
time_zones::TimeZoneFormatsV1Marker::INFO,
252256
#[cfg(feature = "experimental")]
253-
calendar::DateSkeletonPatternsV1Marker::INFO,
254-
#[cfg(feature = "experimental")]
255257
neo::WeekdayNamesV1Marker::INFO,
256258
#[cfg(feature = "experimental")]
257259
neo::DayPeriodNamesV1Marker::INFO,

components/icu/src/registry.rs

Lines changed: 0 additions & 327 deletions
This file was deleted.

provider/baked/src/export.rs

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -445,37 +445,7 @@ impl DataExporter for BakedExporter {
445445
fn flush(&self, marker: DataMarkerInfo) -> Result<(), DataError> {
446446
let marker_bake = bake_marker(marker);
447447

448-
let (struct_type, into_data_payload) = if marker_bake
449-
.to_string()
450-
.trim()
451-
.ends_with("DateSkeletonPatternsV1Marker")
452-
{
453-
(
454-
quote! {
455-
&'static [(
456-
&'static [icu_datetime::fields::Field],
457-
icu_datetime::pattern::runtime::PatternPlurals<'static>
458-
)]
459-
},
460-
quote! {
461-
icu_provider::DataPayload::from_owned(icu_datetime::provider::calendar::DateSkeletonPatternsV1(
462-
payload
463-
.iter()
464-
.map(|(fields, pattern)| (
465-
icu_datetime::provider::calendar::SkeletonV1((*fields).into()),
466-
icu_provider::prelude::zerofrom::ZeroFrom::zero_from(pattern)
467-
))
468-
.collect(),
469-
))
470-
471-
},
472-
)
473-
} else {
474-
(
475-
quote!(<#marker_bake as icu_provider::DynamicDataMarker>::Yokeable),
476-
quote!(icu_provider::DataPayload::from_static_ref(payload)),
477-
)
478-
};
448+
let struct_type = quote!(<#marker_bake as icu_provider::DynamicDataMarker>::Yokeable);
479449

480450
let deduplicated_values = self
481451
.data
@@ -532,7 +502,7 @@ impl DataExporter for BakedExporter {
532502

533503
if let Some(payload) = lookup(req) {
534504
Ok(icu_provider::DataResponse {
535-
payload: #into_data_payload,
505+
payload: icu_provider::DataPayload::from_static_ref(payload),
536506
metadata: Default::default(),
537507
})
538508
} else {
@@ -567,7 +537,7 @@ impl DataExporter for BakedExporter {
567537
};
568538

569539
Ok(icu_provider::DataResponse {
570-
payload: #into_data_payload,
540+
payload: icu_provider::DataPayload::from_static_ref(payload),
571541
metadata
572542
})
573543
}

provider/data/datetime/data/mod.rs

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

0 commit comments

Comments
 (0)