Skip to content

Commit

Permalink
s/data_provider/provider
Browse files Browse the repository at this point in the history
  • Loading branch information
@robertbastian
robertbastian committed Aug 2, 2023
1 parent 354df9f commit 9ccd542
Show file tree
Hide file tree
Showing 15 changed files with 119 additions and 122 deletions.
11 changes: 4 additions & 7 deletions components/calendar/src/japanese.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ impl Japanese {

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::new)]
pub fn try_new_unstable<D: DataProvider<JapaneseErasV1Marker> + ?Sized>(
data_provider: &D,
provider: &D,
) -> Result<Self, CalendarError> {
Ok(Self {
eras: data_provider.load(Default::default())?.take_payload()?,
eras: provider.load(Default::default())?.take_payload()?,
})
}

Expand Down Expand Up @@ -193,13 +193,10 @@ impl JapaneseExtended {

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::new)]
pub fn try_new_unstable<D: DataProvider<JapaneseExtendedErasV1Marker> + ?Sized>(
data_provider: &D,
provider: &D,
) -> Result<Self, CalendarError> {
Ok(Self(Japanese {
eras: data_provider
.load(Default::default())?
.take_payload()?
.cast(),
eras: provider.load(Default::default())?.take_payload()?.cast(),
}))
}
}
Expand Down
24 changes: 12 additions & 12 deletions components/collator/src/comparison.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ impl Collator {

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::try_new)]
pub fn try_new_unstable<D>(
data_provider: &D,
provider: &D,
locale: &DataLocale,
options: CollatorOptions,
) -> Result<Self, CollatorError>
Expand All @@ -115,18 +115,18 @@ impl Collator {
+ ?Sized,
{
Self::try_new_unstable_internal(
data_provider,
data_provider.load(Default::default())?.take_payload()?,
data_provider.load(Default::default())?.take_payload()?,
data_provider.load(Default::default())?.take_payload()?,
|| data_provider.load(Default::default())?.take_payload(),
provider,
provider.load(Default::default())?.take_payload()?,
provider.load(Default::default())?.take_payload()?,
provider.load(Default::default())?.take_payload()?,
|| provider.load(Default::default())?.take_payload(),
locale,
options,
)
}

fn try_new_unstable_internal<D>(
data_provider: &D,
provider: &D,
decompositions: DataPayload<CanonicalDecompositionDataV1Marker>,
tables: DataPayload<CanonicalDecompositionTablesV1Marker>,
jamo: DataPayload<CollationJamoV1Marker>,
Expand All @@ -150,20 +150,20 @@ impl Collator {
};

let metadata_payload: DataPayload<crate::provider::CollationMetadataV1Marker> =
data_provider.load(req)?.take_payload()?;
provider.load(req)?.take_payload()?;

let metadata = metadata_payload.get();

let tailoring: Option<DataPayload<crate::provider::CollationDataV1Marker>> =
if metadata.tailored() {
Some(data_provider.load(req)?.take_payload()?)
Some(provider.load(req)?.take_payload()?)
} else {
None
};

let reordering: Option<DataPayload<crate::provider::CollationReorderingV1Marker>> =
if metadata.reordering() {
Some(data_provider.load(req)?.take_payload()?)
Some(provider.load(req)?.take_payload()?)
} else {
None
};
Expand All @@ -175,10 +175,10 @@ impl Collator {
}

let root: DataPayload<CollationDataV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;

let tailored_diacritics = metadata.tailored_diacritics();
let diacritics: DataPayload<CollationDiacriticsV1Marker> = data_provider
let diacritics: DataPayload<CollationDiacriticsV1Marker> = provider
.load(if tailored_diacritics {
req
} else {
Expand Down
32 changes: 16 additions & 16 deletions components/datetime/src/datetime.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl TimeFormatter {
#[inline]
#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::try_new_with_length)]
pub fn try_new_with_length_unstable<D>(
data_provider: &D,
provider: &D,
locale: &DataLocale,
length: length::Time,
) -> Result<Self, DateTimeError>
Expand All @@ -128,7 +128,7 @@ impl TimeFormatter {
let preferences = Some(preferences::Bag::from_data_locale(locale));

Ok(Self(raw::TimeFormatter::try_new_unstable(
data_provider,
provider,
locale,
length,
preferences,
Expand Down Expand Up @@ -325,7 +325,7 @@ impl<C: CldrCalendar> TypedDateFormatter<C> {
#[inline]
#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::try_new_with_length)]
pub fn try_new_with_length_unstable<D>(
data_provider: &D,
provider: &D,
locale: &DataLocale,
length: length::Date,
) -> Result<Self, DateTimeError>
Expand All @@ -339,9 +339,9 @@ impl<C: CldrCalendar> TypedDateFormatter<C> {
{
Ok(Self(
raw::DateFormatter::try_new_unstable(
data_provider,
calendar::load_lengths_for_cldr_calendar::<C, _>(data_provider, locale)?,
|| calendar::load_symbols_for_cldr_calendar::<C, _>(data_provider, locale),
provider,
calendar::load_lengths_for_cldr_calendar::<C, _>(provider, locale)?,
|| calendar::load_symbols_for_cldr_calendar::<C, _>(provider, locale),
locale,
length,
)?,
Expand Down Expand Up @@ -568,7 +568,7 @@ where {
#[inline]
#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::try_new)]
pub fn try_new_unstable<D>(
data_provider: &D,
provider: &D,
locale: &DataLocale,
options: DateTimeFormatterOptions,
) -> Result<Self, DateTimeError>
Expand All @@ -583,16 +583,16 @@ where {
+ ?Sized,
{
let patterns = PatternSelector::for_options(
data_provider,
calendar::load_lengths_for_cldr_calendar::<C, _>(data_provider, locale)?,
provider,
calendar::load_lengths_for_cldr_calendar::<C, _>(provider, locale)?,
locale,
&options,
)?;
Ok(Self(
raw::DateTimeFormatter::try_new_unstable(
data_provider,
provider,
patterns,
|| calendar::load_symbols_for_cldr_calendar::<C, _>(data_provider, locale),
|| calendar::load_symbols_for_cldr_calendar::<C, _>(provider, locale),
locale,
)?,
PhantomData,
Expand Down Expand Up @@ -711,7 +711,7 @@ where {
#[cfg(feature = "experimental")]
#[inline]
pub fn try_new_experimental_unstable<D>(
data_provider: &D,
provider: &D,
locale: &DataLocale,
options: DateTimeFormatterOptions,
) -> Result<Self, DateTimeError>
Expand All @@ -727,17 +727,17 @@ where {
+ ?Sized,
{
let patterns = PatternSelector::for_options_experimental(
data_provider,
calendar::load_lengths_for_cldr_calendar::<C, _>(data_provider, locale)?,
provider,
calendar::load_lengths_for_cldr_calendar::<C, _>(provider, locale)?,
locale,
&C::DEFAULT_BCP_47_IDENTIFIER,
&options,
)?;
Ok(Self(
raw::DateTimeFormatter::try_new_unstable(
data_provider,
provider,
patterns,
|| calendar::load_symbols_for_cldr_calendar::<C, _>(data_provider, locale),
|| calendar::load_symbols_for_cldr_calendar::<C, _>(provider, locale),
locale,
)?,
PhantomData,
Expand Down
4 changes: 2 additions & 2 deletions components/decimal/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ impl FixedDecimalFormatter {

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::try_new)]
pub fn try_new_unstable<D: DataProvider<provider::DecimalSymbolsV1Marker> + ?Sized>(
data_provider: &D,
provider: &D,
locale: &DataLocale,
options: options::FixedDecimalFormatterOptions,
) -> Result<Self, DecimalError> {
let symbols = data_provider
let symbols = provider
.load(DataRequest {
locale,
metadata: Default::default(),
Expand Down
4 changes: 2 additions & 2 deletions components/list/src/list_formatter.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ macro_rules! constructor {

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::$name)]
pub fn $name_unstable(
data_provider: &(impl DataProvider<$marker> + ?Sized),
provider: &(impl DataProvider<$marker> + ?Sized),
locale: &DataLocale,
length: ListLength,
) -> Result<Self, ListError> {
let data = data_provider
let data = provider
.load(DataRequest {
locale,
metadata: Default::default(),
Expand Down
44 changes: 22 additions & 22 deletions components/normalizer/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1571,16 +1571,16 @@ impl DecomposingNormalizer {
);

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::new_nfd)]
pub fn try_new_nfd_unstable<D>(data_provider: &D) -> Result<Self, NormalizerError>
pub fn try_new_nfd_unstable<D>(provider: &D) -> Result<Self, NormalizerError>
where
D: DataProvider<CanonicalDecompositionDataV1Marker>
+ DataProvider<CanonicalDecompositionTablesV1Marker>
+ ?Sized,
{
let decompositions: DataPayload<CanonicalDecompositionDataV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;
let tables: DataPayload<CanonicalDecompositionTablesV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;

if tables.get().scalars16.len() + tables.get().scalars24.len() > 0xFFF {
// The data is from a future where there exists a normalization flavor whose
Expand Down Expand Up @@ -1677,7 +1677,7 @@ impl DecomposingNormalizer {
);

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::new_nfkd)]
pub fn try_new_nfkd_unstable<D>(data_provider: &D) -> Result<Self, NormalizerError>
pub fn try_new_nfkd_unstable<D>(provider: &D) -> Result<Self, NormalizerError>
where
D: DataProvider<CanonicalDecompositionDataV1Marker>
+ DataProvider<CompatibilityDecompositionSupplementV1Marker>
Expand All @@ -1686,14 +1686,14 @@ impl DecomposingNormalizer {
+ ?Sized,
{
let decompositions: DataPayload<CanonicalDecompositionDataV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;
let supplementary_decompositions: DataPayload<
CompatibilityDecompositionSupplementV1Marker,
> = data_provider.load(Default::default())?.take_payload()?;
> = provider.load(Default::default())?.take_payload()?;
let tables: DataPayload<CanonicalDecompositionTablesV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;
let supplementary_tables: DataPayload<CompatibilityDecompositionTablesV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;

if tables.get().scalars16.len()
+ tables.get().scalars24.len()
Expand Down Expand Up @@ -1809,7 +1809,7 @@ impl DecomposingNormalizer {
#[doc(hidden)]
#[cfg(feature = "experimental")]
pub fn try_new_uts46_decomposed_without_ignored_and_disallowed_unstable<D>(
data_provider: &D,
provider: &D,
) -> Result<Self, NormalizerError>
where
D: DataProvider<CanonicalDecompositionDataV1Marker>
Expand All @@ -1820,13 +1820,13 @@ impl DecomposingNormalizer {
+ ?Sized,
{
let decompositions: DataPayload<CanonicalDecompositionDataV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;
let supplementary_decompositions: DataPayload<Uts46DecompositionSupplementV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;
let tables: DataPayload<CanonicalDecompositionTablesV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;
let supplementary_tables: DataPayload<CompatibilityDecompositionTablesV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;

if tables.get().scalars16.len()
+ tables.get().scalars24.len()
Expand Down Expand Up @@ -2173,17 +2173,17 @@ impl ComposingNormalizer {
);

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::new_nfc)]
pub fn try_new_nfc_unstable<D>(data_provider: &D) -> Result<Self, NormalizerError>
pub fn try_new_nfc_unstable<D>(provider: &D) -> Result<Self, NormalizerError>
where
D: DataProvider<CanonicalDecompositionDataV1Marker>
+ DataProvider<CanonicalDecompositionTablesV1Marker>
+ DataProvider<CanonicalCompositionsV1Marker>
+ ?Sized,
{
let decomposing_normalizer = DecomposingNormalizer::try_new_nfd_unstable(data_provider)?;
let decomposing_normalizer = DecomposingNormalizer::try_new_nfd_unstable(provider)?;

let canonical_compositions: DataPayload<CanonicalCompositionsV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;

Ok(ComposingNormalizer {
decomposing_normalizer,
Expand Down Expand Up @@ -2221,7 +2221,7 @@ impl ComposingNormalizer {
);

#[doc = icu_provider::gen_any_buffer_unstable_docs!(UNSTABLE, Self::new_nfkc)]
pub fn try_new_nfkc_unstable<D>(data_provider: &D) -> Result<Self, NormalizerError>
pub fn try_new_nfkc_unstable<D>(provider: &D) -> Result<Self, NormalizerError>
where
D: DataProvider<CanonicalDecompositionDataV1Marker>
+ DataProvider<CompatibilityDecompositionSupplementV1Marker>
Expand All @@ -2230,10 +2230,10 @@ impl ComposingNormalizer {
+ DataProvider<CanonicalCompositionsV1Marker>
+ ?Sized,
{
let decomposing_normalizer = DecomposingNormalizer::try_new_nfkd_unstable(data_provider)?;
let decomposing_normalizer = DecomposingNormalizer::try_new_nfkd_unstable(provider)?;

let canonical_compositions: DataPayload<CanonicalCompositionsV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;

Ok(ComposingNormalizer {
decomposing_normalizer,
Expand Down Expand Up @@ -2285,7 +2285,7 @@ impl ComposingNormalizer {
/// </div>
#[cfg(feature = "experimental")]
pub fn try_new_uts46_without_ignored_and_disallowed_unstable<D>(
data_provider: &D,
provider: &D,
) -> Result<Self, NormalizerError>
where
D: DataProvider<CanonicalDecompositionDataV1Marker>
Expand All @@ -2298,11 +2298,11 @@ impl ComposingNormalizer {
{
let decomposing_normalizer =
DecomposingNormalizer::try_new_uts46_decomposed_without_ignored_and_disallowed_unstable(
data_provider,
provider,
)?;

let canonical_compositions: DataPayload<CanonicalCompositionsV1Marker> =
data_provider.load(Default::default())?.take_payload()?;
provider.load(Default::default())?.take_payload()?;

Ok(ComposingNormalizer {
decomposing_normalizer,
Expand Down
Loading

0 comments on commit 9ccd542

Please sign in to comment.