itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-10-03 07:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline single-use method Tm::to_timespec()

Browse Source
This commit is contained in:
Dirkjan Ochtman 2022-04-07 15:32:17 +02:00
parent b36663b03b
commit 5ac1934bfe
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/offset/local.rs
View File

@ -66,11 +66,6 @@ fn tm_to_datetime(mut tm: Tm) -> DateTime<Local> {
/// Converts a local `NaiveDateTime` to the `time::Timespec`. /// Converts a local `NaiveDateTime` to the `time::Timespec`.
#[cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind")))] #[cfg(not(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind")))]
fn datetime_to_timespec(d: &NaiveDateTime, local: bool) -> Timespec { fn datetime_to_timespec(d: &NaiveDateTime, local: bool) -> Timespec {
// well, this exploits an undocumented `Tm::to_timespec` behavior
// to get the exact function we want (either `timegm` or `mktime`).
// the number 1 is arbitrary but should be non-zero to trigger `mktime`.
let tm_utcoff = if local { 1 } else { 0 };
let tm = Tm { let tm = Tm {
tm_sec: d.second() as i32, tm_sec: d.second() as i32,
tm_min: d.minute() as i32, tm_min: d.minute() as i32,
@ -81,12 +76,19 @@ fn datetime_to_timespec(d: &NaiveDateTime, local: bool) -> Timespec {
tm_wday: 0, // to_local ignores this tm_wday: 0, // to_local ignores this
tm_yday: 0, // and this tm_yday: 0, // and this
tm_isdst: -1, tm_isdst: -1,
tm_utcoff, // This seems pretty fake?
tm_utcoff: if local { 1 } else { 0 },
// do not set this, OS APIs are heavily inconsistent in terms of leap second handling // do not set this, OS APIs are heavily inconsistent in terms of leap second handling
tm_nsec: 0, tm_nsec: 0,
}; };
tm.to_timespec() Timespec {
sec: match local {
false => utc_tm_to_time(&tm),
true => local_tm_to_time(&tm),
},
nsec: tm.tm_nsec,
}
} }
/// The local timescale. This is implemented via the standard `time` crate. /// The local timescale. This is implemented via the standard `time` crate.
@ -296,17 +298,6 @@ pub(crate) struct Tm {
pub(crate) tm_nsec: i32, pub(crate) tm_nsec: i32,
} }
impl Tm {
/// Convert time to the seconds from January 1, 1970
pub(super) fn to_timespec(&self) -> Timespec {
let sec = match self.tm_utcoff {
0 => utc_tm_to_time(self),
_ => local_tm_to_time(self),
};
Timespec { sec, nsec: self.tm_nsec }
}
}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::Local; use super::Local;