chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

common: Replace unwrap with expect in (Milli)SecondsSinecUnixEpoch constructors

Browse Source
This commit is contained in:
Jonas Platte 2022-04-21 17:15:38 +02:00 committed by Jonas Platte
parent d73f84ebcc
commit eae7fa0a7d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ruma-common/src/time.rs
View File

@ -24,7 +24,7 @@ impl MilliSecondsSinceUnixEpoch {
/// The current system time in milliseconds since the unix epoch. /// The current system time in milliseconds since the unix epoch.
pub fn now() -> Self { pub fn now() -> Self {
#[cfg(not(all(target_arch = "wasm32", target_os = "unknown", feature = "js")))] #[cfg(not(all(target_arch = "wasm32", target_os = "unknown", feature = "js")))]
return Self::from_system_time(SystemTime::now()).unwrap(); return Self::from_system_time(SystemTime::now()).expect("date out of range");
#[cfg(all(target_arch = "wasm32", target_os = "unknown", feature = "js"))] #[cfg(all(target_arch = "wasm32", target_os = "unknown", feature = "js"))]
return Self(f64_to_uint(js_sys::Date::now())); return Self(f64_to_uint(js_sys::Date::now()));
@ -64,7 +64,7 @@ impl SecondsSinceUnixEpoch {
/// The current system-time as seconds since the unix epoch. /// The current system-time as seconds since the unix epoch.
pub fn now() -> Self { pub fn now() -> Self {
#[cfg(not(all(target_arch = "wasm32", target_os = "unknown", feature = "js")))] #[cfg(not(all(target_arch = "wasm32", target_os = "unknown", feature = "js")))]
return Self::from_system_time(SystemTime::now()).unwrap(); return Self::from_system_time(SystemTime::now()).expect("date out of range");
#[cfg(all(target_arch = "wasm32", target_os = "unknown", feature = "js"))] #[cfg(all(target_arch = "wasm32", target_os = "unknown", feature = "js"))]
return Self(f64_to_uint(js_sys::Date::now() / 1000.0)); return Self(f64_to_uint(js_sys::Date::now() / 1000.0));
@ -84,7 +84,9 @@ impl SecondsSinceUnixEpoch {
#[cfg(all(target_arch = "wasm32", target_os = "unknown", feature = "js"))] #[cfg(all(target_arch = "wasm32", target_os = "unknown", feature = "js"))]
fn f64_to_uint(val: f64) -> UInt { fn f64_to_uint(val: f64) -> UInt {
use std::convert::TryFrom; use std::convert::TryFrom;
UInt::try_from(val as u64).unwrap() // UInt::MAX milliseconds is ~285 616 years, we do not account for that
// (or for dates before the unix epoch which would have to be negative)
UInt::try_from(val as u64).expect("date out of range")
} }
#[cfg(test)] #[cfg(test)]