Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Separate SkeletonPatterns into its own key #1139

Merged
merged 3 commits into from
Oct 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 9 additions & 27 deletions components/datetime/src/datetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
use crate::{
format::datetime,
options::DateTimeFormatOptions,
provider::{
gregory::{DatePatternsV1Marker, DateSymbolsV1Marker},
helpers::DateTimePatterns,
},
provider::gregory::{DatePatternsV1Marker, DateSkeletonPatternsV1Marker, DateSymbolsV1Marker},
};
use alloc::string::String;
use icu_locid::Locale;
Expand Down Expand Up @@ -90,34 +87,19 @@ impl<'data> DateTimeFormat<'data> {
///
/// assert_eq!(dtf.is_ok(), true);
/// ```
pub fn try_new<
T: Into<Locale>,
D: DataProvider<'data, DateSymbolsV1Marker>
+ DataProvider<'data, DatePatternsV1Marker>
+ ?Sized,
>(
pub fn try_new<T: Into<Locale>, D>(
locale: T,
data_provider: &D,
options: &DateTimeFormatOptions,
) -> Result<Self, DateTimeFormatError> {
) -> Result<Self, DateTimeFormatError>
where
D: DataProvider<'data, DateSymbolsV1Marker>
+ DataProvider<'data, DatePatternsV1Marker>
+ DataProvider<'data, DateSkeletonPatternsV1Marker>,
{
let locale = locale.into();

let patterns_data: icu_provider::DataPayload<'_, provider::gregory::DatePatternsV1Marker> =
data_provider
.load_payload(&DataRequest {
resource_path: ResourcePath {
key: provider::key::GREGORY_DATE_PATTERNS_V1,
options: ResourceOptions {
variant: None,
langid: Some(locale.clone().into()),
},
},
})?
.take_payload()?;

let pattern = patterns_data
.get()
.get_pattern_for_options(options)?
let pattern = provider::date_time::pattern_for_options(data_provider, &locale, options)?
.unwrap_or_default();

let requires_data = datetime::analyze_pattern(&pattern, false)
Expand Down
2 changes: 1 addition & 1 deletion components/datetime/src/format/datetime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::error::DateTimeFormatError as Error;
use crate::fields::{self, Field, FieldLength, FieldSymbol};
use crate::pattern::{reference::Pattern, PatternItem};
use crate::provider;
use crate::provider::helpers::DateTimeSymbols;
use crate::provider::date_time::DateTimeSymbols;

use alloc::string::ToString;
use core::fmt;
Expand Down
7 changes: 4 additions & 3 deletions components/datetime/src/pattern/hour_cycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ impl CoarseHourCycle {
#[cfg(feature = "provider_transform_internals")]
pub fn apply_on_pattern(
&self,
datetime: &provider::gregory::patterns::DateTimeFormatsV1,
date_time: &provider::gregory::patterns::LengthPatternsV1,
skeletons: &provider::gregory::DateSkeletonPatternsV1,
pattern_str: &str,
mut pattern: Pattern,
) -> Option<String> {
Expand Down Expand Up @@ -90,8 +91,8 @@ impl CoarseHourCycle {
let skeleton = skeleton::Skeleton::from(&pattern);

match skeleton::create_best_pattern_for_fields(
&datetime.skeletons,
&datetime.length_patterns,
skeletons,
date_time,
skeleton.as_slice(),
&Default::default(),
// Prefer using the matched pattern directly, rather than mutating it to match the
Expand Down
Loading