Skip to content

Adjust compilation configuration of tzdb to target_family from target_os #125

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Dec 7, 2024
Merged

Adjust compilation configuration of tzdb to target_family from target_os #125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c0ac5a
Adjust cfg for compilation targets by moving to target_family over ta…
nekevss Dec 7, 2024
0c95547
Totally forgot a '=' for some reason
nekevss Dec 7, 2024
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
10 changes: 5 additions & 5 deletions src/tzdb.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
// offset diff = is_dst { dst_off - std_off } else { std_off - dst_off }, i.e. to_offset - from_offset

use std::path::Path;
#[cfg(not(target_os = "windows"))]
#[cfg(target_family = "unix")]
use std::path::PathBuf;

use alloc::collections::BTreeMap;
Expand All @@ -53,7 +53,7 @@ use crate::{
utils, TemporalError, TemporalResult,
};

#[cfg(not(target_os = "windows"))]
#[cfg(target_family = "unix")]
const ZONEINFO_DIR: &str = "/usr/share/zoneinfo/";

/// `LocalTimeRecord` represents an local time offset record.
Expand Down Expand Up @@ -182,7 +182,7 @@ impl Tzif {
Ok(Self::from(parse_result))
}

#[cfg(not(target_os = "windows"))]
#[cfg(target_family = "unix")]
pub fn read_tzif(identifier: &str) -> TemporalResult<Self> {
let mut path = PathBuf::from(ZONEINFO_DIR);
path.push(identifier);
Expand Down Expand Up @@ -517,10 +517,10 @@ impl FsTzdbProvider {
if let Some(tzif) = self.cache.borrow().get(identifier) {
return Ok(tzif.clone());
}
#[cfg(any(target_os = "linux", target_os = "macos"))]
#[cfg(target_family = "unix")]
let (identifier, tzif) = { (identifier, Tzif::read_tzif(identifier)?) };

#[cfg(target_os = "windows")]
#[cfg(any(target_family = "windows", target_family = "wasm"))]
let (identifier, tzif) = {
let Some((canonical_name, data)) = jiff_tzdb::get(identifier) else {
return Err(
Expand Down
Loading