Skip to content

Commit

Permalink
s/DynDataMarker/DynamicDataMarker
Browse files Browse the repository at this point in the history
  • Loading branch information
robertbastian committed Jun 4, 2024
1 parent 7f4411c commit dde70c1
Show file tree
Hide file tree
Showing 637 changed files with 28,902 additions and 28,902 deletions.
8 changes: 4 additions & 4 deletions components/datetime/src/calendar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -662,13 +662,13 @@ mod private {
/// A collection of marker types associated with all calendars.
///
/// This is used to group together the calendar-specific marker types that produce a common
/// [`DynDataMarker`]. For example, this trait can be implemented for [`YearNamesV1Marker`].
/// [`DynamicDataMarker`]. For example, this trait can be implemented for [`YearNamesV1Marker`].
///
/// This trait serves as a building block for a cross-calendar [`BoundDataProvider`].
#[cfg(any(feature = "datagen", feature = "experimental"))]
pub trait CalMarkers<M>: private::Sealed
where
M: DynDataMarker,
M: DynamicDataMarker,
{
/// The type for a [`Buddhist`] calendar
type Buddhist: DataMarker<Yokeable = M::Yokeable>;
Expand Down Expand Up @@ -727,7 +727,7 @@ impl private::Sealed for NoDataCalMarkers {}
#[cfg(any(feature = "datagen", feature = "experimental"))]
impl<M> CalMarkers<M> for NoDataCalMarkers
where
M: DynDataMarker,
M: DynamicDataMarker,
{
type Buddhist = NeverMarker<M::Yokeable>;
type Chinese = NeverMarker<M::Yokeable>;
Expand Down Expand Up @@ -769,7 +769,7 @@ impl<H, P> AnyCalendarProvider<H, P> {
#[cfg(feature = "experimental")]
impl<M, H, P> BoundDataProvider<M> for AnyCalendarProvider<H, P>
where
M: DynDataMarker,
M: DynamicDataMarker,
H: CalMarkers<M>,
P: Sized
+ DataProvider<H::Buddhist>
Expand Down
16 changes: 8 additions & 8 deletions components/datetime/src/format/neo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ impl<M: DataMarker> DataProvider<M> for PhantomProvider {
}
}

impl<M: DynDataMarker> BoundDataProvider<M> for PhantomProvider {
impl<M: DynamicDataMarker> BoundDataProvider<M> for PhantomProvider {
#[inline]
fn load_bound(&self, req: DataRequest) -> Result<DataResponse<M>, DataError> {
debug_assert!(false);
Expand Down Expand Up @@ -229,11 +229,11 @@ pub trait DateTimeNamesMarker {
pub trait MaybePayload<Y: for<'a> Yokeable<'a>> {
fn maybe_from_payload<M>(payload: DataPayload<M>) -> Option<Self>
where
M: DynDataMarker<Yokeable = Y>,
M: DynamicDataMarker<Yokeable = Y>,
Self: Sized;
fn load_from<P, M>(provider: &P, req: DataRequest) -> Option<Result<Self, DataError>>
where
M: DynDataMarker<Yokeable = Y>,
M: DynamicDataMarker<Yokeable = Y>,
P: BoundDataProvider<M> + ?Sized,
Self: Sized;
#[allow(clippy::needless_lifetimes)] // Yokeable is involved
Expand All @@ -242,19 +242,19 @@ pub trait MaybePayload<Y: for<'a> Yokeable<'a>> {

impl<M0, Y: for<'a> Yokeable<'a>> MaybePayload<Y> for DataPayload<M0>
where
M0: DynDataMarker<Yokeable = Y>,
M0: DynamicDataMarker<Yokeable = Y>,
{
#[inline]
fn maybe_from_payload<M>(payload: DataPayload<M>) -> Option<Self>
where
M: DynDataMarker<Yokeable = Y>,
M: DynamicDataMarker<Yokeable = Y>,
{
Some(payload.cast())
}
#[inline]
fn load_from<P, M>(provider: &P, req: DataRequest) -> Option<Result<Self, DataError>>
where
M: DynDataMarker<Yokeable = Y>,
M: DynamicDataMarker<Yokeable = Y>,
P: BoundDataProvider<M> + ?Sized,
Self: Sized,
{
Expand All @@ -276,14 +276,14 @@ impl<Y: for<'a> Yokeable<'a>> MaybePayload<Y> for () {
#[inline]
fn maybe_from_payload<M>(_payload: DataPayload<M>) -> Option<Self>
where
M: DynDataMarker<Yokeable = Y>,
M: DynamicDataMarker<Yokeable = Y>,
{
None
}
#[inline]
fn load_from<P, M>(_provider: &P, _req: DataRequest) -> Option<Result<Self, DataError>>
where
M: DynDataMarker<Yokeable = Y>,
M: DynamicDataMarker<Yokeable = Y>,
P: BoundDataProvider<M> + ?Sized,
Self: Sized,
{
Expand Down
6 changes: 3 additions & 3 deletions components/datetime/src/provider/calendar/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub struct DateLengthsV1<'data> {

pub(crate) struct ErasedDateLengthsV1Marker;

impl DynDataMarker for ErasedDateLengthsV1Marker {
impl DynamicDataMarker for ErasedDateLengthsV1Marker {
type Yokeable = DateLengthsV1<'static>;
}

Expand Down Expand Up @@ -179,7 +179,7 @@ pub mod patterns {
/// `DataPayload<PatternPluralsV1>`.
pub(crate) struct PatternPluralsFromPatternsV1Marker;

impl DynDataMarker for PatternPluralsFromPatternsV1Marker {
impl DynamicDataMarker for PatternPluralsFromPatternsV1Marker {
type Yokeable = PatternPluralsV1<'static>;
}

Expand All @@ -205,7 +205,7 @@ pub mod patterns {
/// `DataPayload<GenericLengthPatternsV1>`.
pub(crate) struct GenericPatternV1Marker;

impl DynDataMarker for GenericPatternV1Marker {
impl DynamicDataMarker for GenericPatternV1Marker {
type Yokeable = GenericPatternV1<'static>;
}

Expand Down
2 changes: 1 addition & 1 deletion components/datetime/src/provider/calendar/symbols.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pub struct DateSymbolsV1<'data> {
/// For more information on date time symbols, see [`FieldSymbol`](crate::fields::FieldSymbol).
pub(crate) struct ErasedDateSymbolsV1Marker;

impl DynDataMarker for ErasedDateSymbolsV1Marker {
impl DynamicDataMarker for ErasedDateSymbolsV1Marker {
type Yokeable = DateSymbolsV1<'static>;
}

Expand Down
8 changes: 4 additions & 4 deletions components/datetime/src/provider/neo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -692,27 +692,27 @@ pub struct DateTimeSkeletonsV1<'data> {
/// Calendar-agnostic year name data marker
#[derive(Debug)]
pub struct YearNamesV1Marker;
impl DynDataMarker for YearNamesV1Marker {
impl DynamicDataMarker for YearNamesV1Marker {
type Yokeable = YearNamesV1<'static>;
}

/// Calendar-agnostic month name data marker
#[derive(Debug)]
pub struct MonthNamesV1Marker;
impl DynDataMarker for MonthNamesV1Marker {
impl DynamicDataMarker for MonthNamesV1Marker {
type Yokeable = MonthNamesV1<'static>;
}

/// Calendar-agnostic date pattern data marker
#[derive(Debug)]
pub struct DatePatternV1Marker;
impl DynDataMarker for DatePatternV1Marker {
impl DynamicDataMarker for DatePatternV1Marker {
type Yokeable = DatePatternV1<'static>;
}

/// Calendar-agnostic date skeleta data marker
#[derive(Debug)]
pub struct SkeletaV1Marker;
impl DynDataMarker for SkeletaV1Marker {
impl DynamicDataMarker for SkeletaV1Marker {
type Yokeable = PackedSkeletonDataV1<'static>;
}
2 changes: 1 addition & 1 deletion components/experimental/src/compactdecimal/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,6 @@ pub struct Pattern<'data> {
}
pub(crate) struct ErasedCompactDecimalFormatDataV1Marker;

impl DynDataMarker for ErasedCompactDecimalFormatDataV1Marker {
impl DynamicDataMarker for ErasedCompactDecimalFormatDataV1Marker {
type Yokeable = CompactDecimalPatternDataV1<'static>;
}
2 changes: 1 addition & 1 deletion components/experimental/src/relativetime/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,6 @@ impl FromStr for SingularSubPattern<'_> {

pub(crate) struct ErasedRelativeTimeFormatV1Marker;

impl DynDataMarker for ErasedRelativeTimeFormatV1Marker {
impl DynamicDataMarker for ErasedRelativeTimeFormatV1Marker {
type Yokeable = RelativeTimePatternDataV1<'static>;
}
Loading

0 comments on commit dde70c1

Please sign in to comment.