Skip to content
Open
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
7 changes: 7 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ exclude = [
temporal = { version = "0.2.6", path = "./crates/temporal", default-features = false }
timezone_provider = { version = "0.2.6", path = "./crates/provider", default-features = false }
zoneinfo_rs = { version = "0.1.0", path = "./crates/zoneinfo", default-features = false }
temporal_utils = { version = "0.2.6", path = "./crates/temporal_utils" }

# Dependencies
rustc-hash = "2.1.0"
Expand Down
1 change: 1 addition & 0 deletions crates/provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ zoneinfo64 = ["dep:zoneinfo64"]
[dependencies]

# Provider dependency
temporal_utils = { workspace = true }
zerotrie.workspace = true
zerovec = { workspace = true, features = ["derive", "alloc"] }
tinystr = { workspace = true, features = ["zerovec"] }
Expand Down
6 changes: 2 additions & 4 deletions crates/provider/src/common.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
//! Common logic shared across TZif providers

use crate::{
provider::{GapEntryOffsets, UtcOffsetSeconds},
utils,
};
use crate::provider::{GapEntryOffsets, UtcOffsetSeconds};
use temporal_utils as utils;

use core::ops::Range;

Expand Down
4 changes: 2 additions & 2 deletions crates/provider/src/epoch_nanoseconds.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
use crate::TimeZoneProviderError;

pub(crate) use temporal_utils::MS_PER_DAY;

/// Number of nanoseconds in a day
#[doc(hidden)]
pub const NS_PER_DAY: u64 = MS_PER_DAY as u64 * 1_000_000;

pub(crate) const NS_IN_S: i128 = 1_000_000_000;

/// Milliseconds per day constant: 8.64e+7
pub(crate) const MS_PER_DAY: u32 = 24 * 60 * 60 * 1000;
/// Max Instant nanosecond constant
#[doc(hidden)]
pub(crate) const NS_MAX_INSTANT: i128 = NS_PER_DAY as i128 * 100_000_000i128;
Expand Down
3 changes: 2 additions & 1 deletion crates/provider/src/experimental_tzif/posix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ use crate::{
},
epoch_nanoseconds::EpochNanoseconds,
provider::{GapEntryOffsets, TimeZoneProviderResult, UtcOffsetSeconds},
utils, TimeZoneProviderError,
TimeZoneProviderError,
};
use temporal_utils as utils;

use tinystr::TinyAsciiStr;
#[cfg(feature = "datagen")]
Expand Down
3 changes: 2 additions & 1 deletion crates/provider/src/experimental_tzif/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ use crate::{
CandidateEpochNanoseconds, EpochNanosecondsAndOffset, GapEntryOffsets, ResolvedId,
TimeZoneProviderResult, TimeZoneResolver, TransitionDirection, UtcOffsetSeconds,
},
utils, TimeZoneProviderError,
TimeZoneProviderError,
};
use temporal_utils as utils;
use zerofrom::ZeroFrom;

#[derive(Debug, Default)]
Expand Down
3 changes: 0 additions & 3 deletions crates/provider/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,6 @@ pub mod epoch_nanoseconds;
#[cfg(any(feature = "tzif", feature = "experimental_tzif"))]
pub(crate) mod common;

#[doc(hidden)]
pub mod utils;

mod error;
pub mod provider;
pub use error::TimeZoneProviderError;
Expand Down
2 changes: 1 addition & 1 deletion crates/provider/src/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

use core::str::FromStr;

use crate::utils;
use crate::CompiledNormalizer;
use crate::{epoch_nanoseconds::EpochNanoseconds, TimeZoneProviderError};
use alloc::borrow::Cow;
use temporal_utils as utils;

pub(crate) type TimeZoneProviderResult<T> = Result<T, TimeZoneProviderError>;

Expand Down
2 changes: 1 addition & 1 deletion crates/provider/src/tzif.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ use tzif::{
},
};

use crate::utils;
use temporal_utils as utils;

use crate::provider::{
CandidateEpochNanoseconds, GapEntryOffsets, IsoDateTime, NormalizerAndResolver, ResolvedId,
Expand Down
132 changes: 0 additions & 132 deletions crates/provider/src/utils.rs

This file was deleted.

1 change: 1 addition & 0 deletions crates/temporal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ exclude.workspace = true

[dependencies]

temporal_utils = { workspace = true }
core_maths = "0.1.1"
icu_calendar = { workspace = true, features = ["compiled_data"] }
icu_locale_core.workspace = true
Expand Down
16 changes: 3 additions & 13 deletions crates/temporal/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
//! Utility date and time equations for Temporal

pub(crate) use timezone_provider::utils::epoch_days_from_gregorian_date;

// NOTE: Potentially add more of tests.

// ==== Begin Date Equations ====

pub(crate) const MS_PER_HOUR: i64 = 3_600_000;
pub(crate) const MS_PER_MINUTE: i64 = 60_000;

pub(crate) use timezone_provider::utils::{
epoch_days_to_epoch_ms, iso_days_in_month, ymd_from_epoch_milliseconds,
pub(crate) use temporal_utils::{
epoch_days_from_gregorian_date, epoch_days_to_epoch_ms, iso_days_in_month,
ymd_from_epoch_milliseconds, MS_PER_HOUR, MS_PER_MINUTE,
};

// ==== End Calendar Equations ====
21 changes: 21 additions & 0 deletions crates/temporal_utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
[package]
name = "temporal_utils"
description = "Gregorian and ISO-calendar date equations"
edition.workspace = true
version.workspace = true
rust-version.workspace = true
authors.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
exclude.workspace = true
include = [
"src/**/*.rs",
"Cargo.toml",
"LICENSE-Apache",
"LICENSE-MIT",
"README.md",
]

[package.metadata.docs.rs]
all-features = true
Loading
Loading