Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/vendor/time/src/sys/local_offset_at/wasm_js.rs b/vendor/time/src/sys/local_offset_at/wasm_js.rs
index fcea4b0f5..dfbe063a2 100644
--- a/vendor/time/src/sys/local_offset_at/wasm_js.rs
+++ b/vendor/time/src/sys/local_offset_at/wasm_js.rs
@@ -1,3 +1,4 @@
+use crate::convert::*;
 use crate::{OffsetDateTime, UtcOffset};
 
 /// Obtain the system's UTC offset.
@@ -6,7 +7,7 @@ pub(super) fn local_offset_at(datetime: OffsetDateTime) -> Option<UtcOffset> {
     // The number of minutes returned by getTimezoneOffset() is positive if the local time zone
     // is behind UTC, and negative if the local time zone is ahead of UTC. For example,
     // for UTC+10, -600 will be returned.
-    let timezone_offset = (js_date.get_timezone_offset() as i32) * -60;
+    let timezone_offset = (js_date.get_timezone_offset() as i32) * -(Minute.per(Hour) as i32);
 
     UtcOffset::from_whole_seconds(timezone_offset).ok()
 }
diff --git a/vendor/time/src/sys/local_offset_at/windows.rs b/vendor/time/src/sys/local_offset_at/windows.rs
index 69b422314..a4d5882d6 100644
--- a/vendor/time/src/sys/local_offset_at/windows.rs
+++ b/vendor/time/src/sys/local_offset_at/windows.rs
@@ -2,6 +2,7 @@
 
 use core::mem::MaybeUninit;
 
+use crate::convert::*;
 use crate::{OffsetDateTime, UtcOffset};
 
 // ffi: WINAPI FILETIME struct
@@ -56,7 +57,7 @@ fn systemtime_to_filetime(systime: &SystemTime) -> Option<FileTime> {
 /// Convert a `FILETIME` to an `i64`, representing a number of seconds.
 fn filetime_to_secs(filetime: &FileTime) -> i64 {
     /// FILETIME represents 100-nanosecond intervals
-    const FT_TO_SECS: i64 = 10_000_000;
+    const FT_TO_SECS: i64 = Nanosecond.per(Second) as i64 / 100;
     ((filetime.dwHighDateTime as i64) << 32 | filetime.dwLowDateTime as i64) / FT_TO_SECS
 }