diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-09-08 16:23:24 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-09-11 16:34:44 +0200 |
| commit | 902c422cf1b288176d226eab3c0637106d62fca8 (patch) | |
| tree | db77507687c4d108277b147bd00bdd43de7559ce | |
| parent | a275f6a5f9bf5ea42bd33fa3483680fb0ced0e15 (diff) | |
| download | mullvadvpn-902c422cf1b288176d226eab3c0637106d62fca8.tar.xz mullvadvpn-902c422cf1b288176d226eab3c0637106d62fca8.zip | |
Fix chrono warnings
3 files changed, 8 insertions, 6 deletions
diff --git a/mullvad-management-interface/src/types/conversions/account.rs b/mullvad-management-interface/src/types/conversions/account.rs index 4f1f6dc5c2..82b3ebfb49 100644 --- a/mullvad-management-interface/src/types/conversions/account.rs +++ b/mullvad-management-interface/src/types/conversions/account.rs @@ -1,4 +1,5 @@ use crate::types; +use chrono::TimeZone; use mullvad_types::account::{AccountData, VoucherSubmission}; use super::FromProtobufTypeError; @@ -27,7 +28,7 @@ impl TryFrom<types::VoucherSubmission> for VoucherSubmission { .unwrap(); Ok(VoucherSubmission { - new_expiry: chrono::DateTime::<chrono::Utc>::from_utc(ndt, chrono::Utc), + new_expiry: chrono::Utc.from_utc_datetime(&ndt), time_added: submission.seconds_added, }) } @@ -55,7 +56,7 @@ impl TryFrom<types::AccountData> for AccountData { chrono::NaiveDateTime::from_timestamp_opt(expiry.seconds, expiry.nanos as u32).unwrap(); Ok(AccountData { - expiry: chrono::DateTime::<chrono::Utc>::from_utc(ndt, chrono::Utc), + expiry: chrono::Utc.from_utc_datetime(&ndt), }) } } diff --git a/mullvad-management-interface/src/types/conversions/device.rs b/mullvad-management-interface/src/types/conversions/device.rs index faa97b8ab0..7cabbfc40b 100644 --- a/mullvad-management-interface/src/types/conversions/device.rs +++ b/mullvad-management-interface/src/types/conversions/device.rs @@ -1,4 +1,5 @@ use crate::types::{conversions::bytes_to_pubkey, proto, FromProtobufTypeError}; +use chrono::TimeZone; use prost_types::Timestamp; impl TryFrom<proto::Device> for mullvad_types::device::Device { @@ -10,8 +11,8 @@ impl TryFrom<proto::Device> for mullvad_types::device::Device { name: device.name, pubkey: bytes_to_pubkey(&device.pubkey)?, hijack_dns: device.hijack_dns, - created: chrono::DateTime::from_utc( - chrono::NaiveDateTime::from_timestamp_opt( + created: chrono::Utc.from_utc_datetime( + &chrono::NaiveDateTime::from_timestamp_opt( device .created .ok_or(FromProtobufTypeError::InvalidArgument( @@ -21,7 +22,6 @@ impl TryFrom<proto::Device> for mullvad_types::device::Device { 0, ) .unwrap(), - chrono::Utc, ), }) } diff --git a/mullvad-management-interface/src/types/conversions/wireguard.rs b/mullvad-management-interface/src/types/conversions/wireguard.rs index 13b94c1d52..1d361a4ffb 100644 --- a/mullvad-management-interface/src/types/conversions/wireguard.rs +++ b/mullvad-management-interface/src/types/conversions/wireguard.rs @@ -1,5 +1,6 @@ use super::FromProtobufTypeError; use crate::types::proto; +use chrono::TimeZone; use prost_types::Timestamp; impl From<mullvad_types::wireguard::PublicKey> for proto::PublicKey { @@ -29,7 +30,7 @@ impl TryFrom<proto::PublicKey> for mullvad_types::wireguard::PublicKey { Ok(mullvad_types::wireguard::PublicKey { key: talpid_types::net::wireguard::PublicKey::try_from(public_key.key.as_slice()) .map_err(|_| FromProtobufTypeError::InvalidArgument("invalid wireguard key"))?, - created: chrono::DateTime::<chrono::Utc>::from_utc(ndt, chrono::Utc), + created: chrono::Utc.from_utc_datetime(&ndt), }) } } |
