Skip to content

Commit

Permalink
check
Browse files Browse the repository at this point in the history
  • Loading branch information
@robertbastian
robertbastian committed Jun 21, 2024
1 parent 18cb983 commit 81f0af9
Show file tree
Hide file tree
Showing 121 changed files with 1,704 additions and 1,242 deletions.
15 changes: 12 additions & 3 deletions components/calendar/src/week_of.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ impl WeekCalculator {
DataProvider::<WeekDataV1Marker>::load(
&provider.as_downcasting(),
DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
},
)
Expand All @@ -84,7 +87,10 @@ impl WeekCalculator {
DataProvider::<WeekDataV1Marker>::load(
&provider.as_deserializing(),
DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
},
)
Expand All @@ -100,7 +106,10 @@ impl WeekCalculator {
{
provider
.load(DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
})
.map(|response| WeekCalculator {
Expand Down
5 changes: 4 additions & 1 deletion components/collator/src/comparison.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,10 @@ impl Collator {
+ ?Sized,
{
let req = DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
};

Expand Down
15 changes: 12 additions & 3 deletions components/collator/tests/tests.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,10 @@ fn test_nb_nn_no() {
DataProvider::<CollationDataV1Marker>::load(
&icu_collator::provider::Baked,
DataRequest {
locale: &locale,
id: DataIdentityBorrowed {
locale: &locale,
..Default::default()
},
..Default::default()
}
)
Expand All @@ -1211,7 +1214,10 @@ fn test_nb_nn_no() {
DataProvider::<CollationDataV1Marker>::load(
&icu_collator::provider::Baked,
DataRequest {
locale: &locale,
id: DataIdentityBorrowed {
locale: &locale,
..Default::default()
},
..Default::default()
}
)
Expand All @@ -1231,7 +1237,10 @@ fn test_nb_nn_no() {
DataProvider::<CollationDataV1Marker>::load(
&icu_collator::provider::Baked,
DataRequest {
locale: &locale,
id: DataIdentityBorrowed {
locale: &locale,
..Default::default()
},
..Default::default()
}
)
Expand Down
20 changes: 16 additions & 4 deletions components/datetime/src/calendar.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,10 @@ where
{
let payload = provider
.load(DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
})?
.payload;
Expand All @@ -405,7 +408,10 @@ where
{
let payload = provider
.load(DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
})?
.payload;
Expand Down Expand Up @@ -434,7 +440,10 @@ where
+ ?Sized,
{
let req = DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
};
let payload = match kind {
Expand Down Expand Up @@ -555,7 +564,10 @@ where
+ ?Sized,
{
let req = DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
};
let payload = match kind {
Expand Down
29 changes: 29 additions & 0 deletions components/datetime/src/external_loaders.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,35 @@ pub(crate) trait AnyCalendarLoader {
fn load(&self, locale: &DataLocale) -> Result<AnyCalendar, DataError>;
}

/// Helper for type resolution with optional loader arguments
pub(crate) struct PhantomLoader {
_not_constructible: core::convert::Infallible,
}

impl FixedDecimalFormatterLoader for PhantomLoader {
fn load(
&self,
_locale: &DataLocale,
_options: FixedDecimalFormatterOptions,
) -> Result<FixedDecimalFormatter, DataError> {
unreachable!() // not constructible
}
}

impl WeekCalculatorLoader for PhantomLoader {
#[inline]
fn load(&self, _locale: &DataLocale) -> Result<WeekCalculator, DataError> {
unreachable!() // not constructible
}
}

impl AnyCalendarLoader for PhantomLoader {
#[inline]
fn load(&self, _locale: &DataLocale) -> Result<AnyCalendar, DataError> {
unreachable!() // not constructible
}
}

/// Loader for types from other crates using compiled data.
#[cfg(feature = "compiled_data")]
pub(crate) struct ExternalLoaderCompiledData;
Expand Down
5 changes: 4 additions & 1 deletion components/datetime/src/format/datetime.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,10 @@ mod tests {

let locale = "en-u-ca-gregory".parse().unwrap();
let req = DataRequest {
locale: &locale,
id: DataIdentityBorrowed {
locale: &locale,
..Default::default()
},
..Default::default()
};
let date_data =
Expand Down
38 changes: 21 additions & 17 deletions components/datetime/src/format/neo.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1025,9 +1025,9 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
};
let payload = provider
.load_bound(DataRequest {
locale,
marker_attributes: &DataMarkerAttributes::from_tinystr(
marker_attrs::symbol_attr_for(
id: DataIdentityBorrowed {
locale,
marker_attributes: marker_attrs::symbol_attr_for(
marker_attrs::Context::Format,
match field_length {
FieldLength::Abbreviated => marker_attrs::Length::Abbr,
Expand All @@ -1036,7 +1036,8 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
_ => return Err(SingleLoadError::UnsupportedField(field)),
},
),
),
},

..Default::default()
})
.map_err(SingleLoadError::Data)?
Expand Down Expand Up @@ -1075,9 +1076,9 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
};
let payload = provider
.load_bound(DataRequest {
locale,
marker_attributes: &DataMarkerAttributes::from_tinystr(
marker_attrs::symbol_attr_for(
id: DataIdentityBorrowed {
locale,
marker_attributes: marker_attrs::symbol_attr_for(
match field_symbol {
fields::Month::Format => marker_attrs::Context::Format,
fields::Month::StandAlone => marker_attrs::Context::Standalone,
Expand All @@ -1089,7 +1090,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
_ => return Err(SingleLoadError::UnsupportedField(field)),
},
),
),
},
..Default::default()
})
.map_err(SingleLoadError::Data)?
Expand Down Expand Up @@ -1127,9 +1128,9 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
let payload = R::DayPeriodNames::load_from(
provider,
DataRequest {
locale,
marker_attributes: &DataMarkerAttributes::from_tinystr(
marker_attrs::symbol_attr_for(
id: DataIdentityBorrowed {
locale,
marker_attributes: marker_attrs::symbol_attr_for(
marker_attrs::Context::Format,
match field_length {
FieldLength::Abbreviated => marker_attrs::Length::Abbr,
Expand All @@ -1138,7 +1139,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
_ => return Err(SingleLoadError::UnsupportedField(field)),
},
),
),
},
..Default::default()
},
)
Expand Down Expand Up @@ -1179,9 +1180,9 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
};
let payload = provider
.load_bound(DataRequest {
locale,
marker_attributes: &DataMarkerAttributes::from_tinystr(
marker_attrs::symbol_attr_for(
id: DataIdentityBorrowed {
locale,
marker_attributes: marker_attrs::symbol_attr_for(
match field_symbol {
// UTS 35 says that "e" and "E" have the same non-numeric names
fields::Weekday::Format | fields::Weekday::Local => {
Expand All @@ -1197,7 +1198,7 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
_ => return Err(SingleLoadError::UnsupportedField(field)),
},
),
),
},
..Default::default()
})
.map_err(SingleLoadError::Data)?
Expand Down Expand Up @@ -1234,7 +1235,10 @@ impl<R: DateTimeNamesMarker> RawDateTimeNames<R> {
let payload = R::ZoneGenericShortNames::load_from(
provider,
DataRequest {
locale,
id: DataIdentityBorrowed {
locale,
..Default::default()
},
..Default::default()
},
)
Expand Down
2 changes: 1 addition & 1 deletion components/datetime/src/neo.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,7 @@ impl<R: DateTimeMarkers> NeoFormatter<R> {
/// ```
pub fn convert_and_format<'a, I>(&'a self, datetime: &I) -> FormattedNeoDateTime
where
I: ConvertCalendar,
I: ?Sized + ConvertCalendar,
I::Converted<'a>: NeoGetField<<R::D as DateMarkers>::YearInput>
+ NeoGetField<<R::D as DateMarkers>::MonthInput>
+ NeoGetField<<R::D as DateMarkers>::DayOfMonthInput>
Expand Down
Loading

0 comments on commit 81f0af9

Please sign in to comment.