Skip to content

Commit c8d77ff

Browse files
robertbastianrobertbastian
authored
Renaming load_payload, load_resource (#2222)
1 parent 84966f9 commit c8d77ff

File tree

73 files changed

+356
-417
lines changed

Some content is hidden

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

73 files changed

+356
-417
lines changed

‎components/calendar/src/japanese.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl Japanese {
106106
request.options = Locale::from_str(cal)
107107
.expect("Locale string is known valid")
108108
.into();
109-
let eras = data_provider.load_resource(&request)?.take_payload()?;
109+
let eras = data_provider.load(&request)?.take_payload()?;
110110
Ok(Self { eras, japanext })
111111
}
112112
}

‎components/collator/src/comparison.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ impl Collator {
130130

131131
let metadata_payload: DataPayload<crate::provider::CollationMetadataV1Marker> =
132132
data_provider
133-
.load_resource(&DataRequest {
133+
.load(&DataRequest {
134134
options: data_options.clone(),
135135
metadata: Default::default(),
136136
})?
@@ -142,7 +142,7 @@ impl Collator {
142142
if metadata.tailored() {
143143
Some(
144144
data_provider
145-
.load_resource(&DataRequest {
145+
.load(&DataRequest {
146146
options: data_options.clone(),
147147
metadata: Default::default(),
148148
})?
@@ -156,7 +156,7 @@ impl Collator {
156156
if metadata.reordering() {
157157
Some(
158158
data_provider
159-
.load_resource(&DataRequest {
159+
.load(&DataRequest {
160160
options: data_options.clone(),
161161
metadata: Default::default(),
162162
})?
@@ -173,12 +173,12 @@ impl Collator {
173173
}
174174

175175
let root: DataPayload<CollationDataV1Marker> = data_provider
176-
.load_resource(&DataRequest::default())?
176+
.load(&DataRequest::default())?
177177
.take_payload()?;
178178

179179
let tailored_diacritics = metadata.tailored_diacritics();
180180
let diacritics: DataPayload<CollationDiacriticsV1Marker> = data_provider
181-
.load_resource(&DataRequest {
181+
.load(&DataRequest {
182182
options: if tailored_diacritics {
183183
data_options
184184
} else {
@@ -202,19 +202,19 @@ impl Collator {
202202
}
203203

204204
let jamo: DataPayload<CollationJamoV1Marker> = data_provider
205-
.load_resource(&DataRequest::default())? // TODO: redesign Korean search collation handling
205+
.load(&DataRequest::default())? // TODO: redesign Korean search collation handling
206206
.take_payload()?;
207207

208208
if jamo.get().ce32s.len() != JAMO_COUNT {
209209
return Err(CollatorError::MalformedData);
210210
}
211211

212212
let decompositions: DataPayload<CanonicalDecompositionDataV1Marker> = data_provider
213-
.load_resource(&DataRequest::default())?
213+
.load(&DataRequest::default())?
214214
.take_payload()?;
215215

216216
let tables: DataPayload<CanonicalDecompositionTablesV1Marker> = data_provider
217-
.load_resource(&DataRequest::default())?
217+
.load(&DataRequest::default())?
218218
.take_payload()?;
219219

220220
let ccc = icu_properties::maps::get_canonical_combining_class(data_provider)?;
@@ -238,7 +238,7 @@ impl Collator {
238238
|| merged_options.numeric()
239239
{
240240
let special_primaries: DataPayload<CollationSpecialPrimariesV1Marker> = data_provider
241-
.load_resource(&DataRequest::default())?
241+
.load(&DataRequest::default())?
242242
.take_payload()?;
243243
// `variant_count` isn't stable yet:
244244
// https://github.com/rust-lang/rust/issues/73662

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,15 +535,15 @@ mod tests {
535535
let provider = icu_testdata::get_provider();
536536
let locale: Locale = "en-u-ca-gregory".parse().unwrap();
537537
let date_data: DataPayload<DateSymbolsV1Marker> = provider
538-
.load_resource(&DataRequest {
538+
.load(&DataRequest {
539539
options: locale.clone().into(),
540540
metadata: Default::default(),
541541
})
542542
.unwrap()
543543
.take_payload()
544544
.unwrap();
545545
let time_data: DataPayload<TimeSymbolsV1Marker> = provider
546-
.load_resource(&DataRequest {
546+
.load(&DataRequest {
547547
options: locale.clone().into(),
548548
metadata: Default::default(),
549549
})

‎components/datetime/src/provider/date_time.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ where
6262
D: DataProvider<TimePatternsV1Marker> + ?Sized,
6363
{
6464
let data = data_provider
65-
.load_resource(&DataRequest {
65+
.load(&DataRequest {
6666
options: DataOptions::from(locale),
6767
metadata: Default::default(),
6868
})?
@@ -107,7 +107,7 @@ where
107107
D: DataProvider<DatePatternsV1Marker> + ?Sized,
108108
{
109109
let data = data_provider
110-
.load_resource(&DataRequest {
110+
.load(&DataRequest {
111111
options: DataOptions::from(locale),
112112
metadata: Default::default(),
113113
})?
@@ -276,7 +276,7 @@ where
276276
fn skeleton_data_payload(self) -> Result<DataPayload<DateSkeletonPatternsV1Marker>> {
277277
let data = self
278278
.data_provider
279-
.load_resource(&DataRequest {
279+
.load(&DataRequest {
280280
options: DataOptions::from(self.locale),
281281
metadata: Default::default(),
282282
})?

‎components/datetime/src/raw/datetime.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl TimeFormatter {
6868
let symbols_data = if required.time_symbols_data {
6969
Some(
7070
data_provider
71-
.load_resource(&DataRequest {
71+
.load(&DataRequest {
7272
options: DataOptions::from(&locale),
7373
metadata: Default::default(),
7474
})?
@@ -211,7 +211,7 @@ impl DateFormatter {
211211
let week_data = if required.week_data {
212212
Some(
213213
data_provider
214-
.load_resource(&DataRequest {
214+
.load(&DataRequest {
215215
options: DataOptions::from(&locale),
216216
metadata: Default::default(),
217217
})?
@@ -234,7 +234,7 @@ impl DateFormatter {
234234
let symbols_data = if required.date_symbols_data {
235235
Some(
236236
data_provider
237-
.load_resource(&DataRequest {
237+
.load(&DataRequest {
238238
options: DataOptions::from(&locale),
239239
metadata: Default::default(),
240240
})?
@@ -430,7 +430,7 @@ impl DateTimeFormatter {
430430
let week_data = if required.week_data {
431431
Some(
432432
data_provider
433-
.load_resource(&DataRequest {
433+
.load(&DataRequest {
434434
options: DataOptions::from(&locale),
435435
metadata: Default::default(),
436436
})?
@@ -453,7 +453,7 @@ impl DateTimeFormatter {
453453
let date_symbols_data = if required.date_symbols_data {
454454
Some(
455455
data_provider
456-
.load_resource(&DataRequest {
456+
.load(&DataRequest {
457457
options: DataOptions::from(&locale),
458458
metadata: Default::default(),
459459
})?
@@ -466,7 +466,7 @@ impl DateTimeFormatter {
466466
let time_symbols_data = if required.time_symbols_data {
467467
Some(
468468
data_provider
469-
.load_resource(&DataRequest {
469+
.load(&DataRequest {
470470
options: DataOptions::from(&locale),
471471
metadata: Default::default(),
472472
})?

‎components/datetime/src/raw/zoned_datetime.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl ZonedDateTimeFormatter {
9494
let week_data = if required.week_data {
9595
Some(
9696
date_provider
97-
.load_resource(&DataRequest {
97+
.load(&DataRequest {
9898
options: DataOptions::from(&locale),
9999
metadata: Default::default(),
100100
})?
@@ -117,7 +117,7 @@ impl ZonedDateTimeFormatter {
117117
let date_symbols_data = if required.date_symbols_data {
118118
Some(
119119
date_provider
120-
.load_resource(&DataRequest {
120+
.load(&DataRequest {
121121
options: DataOptions::from(&locale),
122122
metadata: Default::default(),
123123
})?
@@ -130,7 +130,7 @@ impl ZonedDateTimeFormatter {
130130
let time_symbols_data = if required.time_symbols_data {
131131
Some(
132132
date_provider
133-
.load_resource(&DataRequest {
133+
.load(&DataRequest {
134134
options: DataOptions::from(&locale),
135135
metadata: Default::default(),
136136
})?

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ mod test {
4444
let provider = icu_testdata::get_provider();
4545
let locale: Locale = "en-u-ca-gregory".parse().unwrap();
4646
let patterns = provider
47-
.load_resource(&DataRequest {
47+
.load(&DataRequest {
4848
options: DataOptions::from(&locale),
4949
metadata: Default::default(),
5050
})
5151
.expect("Failed to load payload")
5252
.take_payload()
5353
.expect("Failed to retrieve payload");
5454
let skeletons = provider
55-
.load_resource(&DataRequest {
55+
.load(&DataRequest {
5656
options: locale.into(),
5757
metadata: Default::default(),
5858
})

‎components/datetime/src/time_zone.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use icu_provider::prelude::*;
2323
use writeable::Writeable;
2424

2525
/// Loads a resource into its destination if the destination has not already been filled.
26-
fn load_resource<D, L, P>(
26+
fn load<D, L, P>(
2727
locale: &L,
2828
destination: &mut Option<DataPayload<D>>,
2929
provider: &P,
@@ -37,7 +37,7 @@ where
3737
if destination.is_none() {
3838
*destination = Some(
3939
provider
40-
.load_resource(&DataRequest {
40+
.load(&DataRequest {
4141
options: langid.into(),
4242
metadata: Default::default(),
4343
})?
@@ -132,7 +132,7 @@ impl TimeZoneFormatter {
132132
let format_units = SmallVec::<[TimeZoneFormatterUnit; 3]>::new();
133133
let data_payloads = TimeZoneDataPayloads {
134134
zone_formats: zone_provider
135-
.load_resource(&DataRequest {
135+
.load(&DataRequest {
136136
options: DataOptions::from(&locale),
137137
metadata: Default::default(),
138138
})?
@@ -383,7 +383,7 @@ impl TimeZoneFormatter {
383383
let format_units = SmallVec::<[TimeZoneFormatterUnit; 3]>::new();
384384
let data_payloads = TimeZoneDataPayloads {
385385
zone_formats: zone_provider
386-
.load_resource(&DataRequest {
386+
.load(&DataRequest {
387387
options: DataOptions::from(&locale),
388388
metadata: Default::default(),
389389
})?
@@ -437,7 +437,7 @@ impl TimeZoneFormatter {
437437
ZP: DataProvider<provider::time_zones::MetaZoneGenericNamesLongV1Marker> + ?Sized,
438438
{
439439
if self.data_payloads.mz_generic_long == None {
440-
load_resource(
440+
load(
441441
&self.locale,
442442
&mut self.data_payloads.mz_generic_long,
443443
zone_provider,
@@ -459,7 +459,7 @@ impl TimeZoneFormatter {
459459
ZP: DataProvider<provider::time_zones::MetaZoneGenericNamesShortV1Marker> + ?Sized,
460460
{
461461
if self.data_payloads.mz_generic_short == None {
462-
load_resource(
462+
load(
463463
&self.locale,
464464
&mut self.data_payloads.mz_generic_short,
465465
zone_provider,
@@ -481,7 +481,7 @@ impl TimeZoneFormatter {
481481
ZP: DataProvider<provider::time_zones::MetaZoneSpecificNamesLongV1Marker> + ?Sized,
482482
{
483483
if self.data_payloads.mz_specific_long == None {
484-
load_resource(
484+
load(
485485
&self.locale,
486486
&mut self.data_payloads.mz_specific_long,
487487
zone_provider,
@@ -503,7 +503,7 @@ impl TimeZoneFormatter {
503503
ZP: DataProvider<provider::time_zones::MetaZoneSpecificNamesShortV1Marker> + ?Sized,
504504
{
505505
if self.data_payloads.mz_specific_short == None {
506-
load_resource(
506+
load(
507507
&self.locale,
508508
&mut self.data_payloads.mz_specific_short,
509509
zone_provider,
@@ -525,7 +525,7 @@ impl TimeZoneFormatter {
525525
ZP: DataProvider<provider::time_zones::ExemplarCitiesV1Marker> + ?Sized,
526526
{
527527
if self.data_payloads.exemplar_cities == None {
528-
load_resource(
528+
load(
529529
&self.locale,
530530
&mut self.data_payloads.exemplar_cities,
531531
zone_provider,
@@ -547,7 +547,7 @@ impl TimeZoneFormatter {
547547
ZP: DataProvider<provider::time_zones::ExemplarCitiesV1Marker> + ?Sized,
548548
{
549549
if self.data_payloads.exemplar_cities == None {
550-
load_resource(
550+
load(
551551
&self.locale,
552552
&mut self.data_payloads.exemplar_cities,
553553
zone_provider,

0 commit comments

Comments
 (0)