itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-09-28 05:21:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve From<js_sys::Date> Variants for DateTime<Utc>

Browse Source
This commit is contained in:
Marc Schreiber 2020-05-09 21:15:26 +02:00 committed by Brandon W Maister
parent 4348cd13c7
commit 545fd9f863
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -14,6 +14,11 @@ Versions with only mechanical changes will be omitted from the following list.
* Add `DurationRound` trait that allows rounding and truncating by `Duration` (@robyoung)
### Internal Improvements
* Code improvements to impl `From` for `js_sys` in wasm to reuse code (@schrieveslaach)
## 0.4.12
### New Methods and impls

16
src/datetime.rs
View File

@ -753,22 +753,18 @@ impl<Tz: TimeZone> From<DateTime<Tz>> for SystemTime {
#[cfg(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind"))]
impl From<js_sys::Date> for DateTime<Utc> {
fn from(date: js_sys::Date) -> DateTime<Utc> {
let time = date.get_time() as i64;
DateTime::<Utc>::from_utc(
NaiveDateTime::from_timestamp(time / 1000, ((time % 1000) * 1_000_000) as u32),
Utc,
)
DateTime::<Utc>::from(&date)
}
}
#[cfg(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind"))]
impl From<&js_sys::Date> for DateTime<Utc> {
fn from(date: &js_sys::Date) -> DateTime<Utc> {
let time = date.get_time() as i64;
DateTime::<Utc>::from_utc(
NaiveDateTime::from_timestamp(time / 1000, ((time % 1000) * 1_000_000) as u32),
Utc,
)
let millisecs_since_unix_epoch: u64 = date.get_time() as u64;
let secs = millisecs_since_unix_epoch / 1000;
let nanos = 1_000_000 * (millisecs_since_unix_epoch - 1000 * secs);
let naive = NaiveDateTime::from_timestamp(secs as i64, nanos as u32);
DateTime::from_utc(naive, Utc)
}
}

6
src/offset/utc.rs
View File

@ -54,11 +54,7 @@ impl Utc {
#[cfg(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind"))]
pub fn now() -> DateTime<Utc> {
let now = js_sys::Date::new_0();
let millisecs_since_unix_epoch: u64 = now.get_time() as u64;
let secs = millisecs_since_unix_epoch / 1000;
let nanos = 1_000_000 * (millisecs_since_unix_epoch - 1000 * secs);
let naive = NaiveDateTime::from_timestamp(secs as i64, nanos as u32);
DateTime::from_utc(naive, Utc)
DateTime::<Utc>::from(now)
}
}