proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-15 00:12:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

time: rustfmt

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-04-10 12:33:56 +02:00
parent 800cf63a8a
commit 4554034d32
7 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
proxmox-time/src/daily_duration.rs
View File

@ -3,9 +3,7 @@ use std::convert::{TryFrom, TryInto};
use anyhow::Error; use anyhow::Error;
use nom::{ use nom::{
bytes::complete::tag, bytes::complete::tag, character::complete::space0, error::context,
character::complete::space0,
error::context,
multi::separated_nonempty_list, multi::separated_nonempty_list,
}; };
@ -15,7 +13,6 @@ use crate::{parse_weekdays_range, WeekDays};
#[cfg(not(target_arch = "wasm32"))] #[cfg(not(target_arch = "wasm32"))]
use crate::TmEditor; use crate::TmEditor;
/// Time of Day (hour with minute) /// Time of Day (hour with minute)
#[derive(Default, PartialEq, Clone, Debug)] #[derive(Default, PartialEq, Clone, Debug)]
pub struct HmTime { pub struct HmTime {

8
proxmox-time/src/date_time_value.rs
View File

@ -40,7 +40,9 @@ impl DateTimeValue {
let mut next: Option<u32> = None; let mut next: Option<u32> = None;
let mut set_next = |v: u32| { let mut set_next = |v: u32| {
if let Some(n) = next { if let Some(n) = next {
if v < n { next = Some(v); } if v < n {
next = Some(v);
}
} else { } else {
next = Some(v); next = Some(v);
} }
@ -48,7 +50,9 @@ impl DateTimeValue {
for spec in list { for spec in list {
match spec { match spec {
DateTimeValue::Single(v) => { DateTimeValue::Single(v) => {
if *v > value { set_next(*v); } if *v > value {
set_next(*v);
}
} }
DateTimeValue::Range(start, end) => { DateTimeValue::Range(start, end) => {
if value < *start { if value < *start {

1
proxmox-time/src/time_span.rs
View File

@ -271,4 +271,3 @@ pub fn verify_time_span(i: &str) -> Result<(), Error> {
let _: TimeSpan = i.parse()?; let _: TimeSpan = i.parse()?;
Ok(()) Ok(())
} }

6
proxmox-time/src/wasm.rs
View File

@ -10,18 +10,18 @@ pub fn epoch_f64() -> f64 {
js_sys::Date::now() / 1000.0 js_sys::Date::now() / 1000.0
} }
/// Convert Unix epoch into RFC3339 local time with TZ /// Convert Unix epoch into RFC3339 local time with TZ
pub fn epoch_to_rfc3339(epoch: i64) -> Result<String, Error> { pub fn epoch_to_rfc3339(epoch: i64) -> Result<String, Error> {
let js_date = js_sys::Date::new_0(); let js_date = js_sys::Date::new_0();
js_date.set_time((epoch as f64) * 1000.0); js_date.set_time((epoch as f64) * 1000.0);
js_date.to_iso_string().as_string() js_date
.to_iso_string()
.as_string()
.ok_or_else(|| format_err!("to_iso_string did not return a string")) .ok_or_else(|| format_err!("to_iso_string did not return a string"))
} }
/// Parse RFC3339 into Unix epoch /// Parse RFC3339 into Unix epoch
pub fn parse_rfc3339(input_str: &str) -> Result<i64, Error> { pub fn parse_rfc3339(input_str: &str) -> Result<i64, Error> {
// TOTO: This should parse olny RFC3339, but currently also parse // TOTO: This should parse olny RFC3339, but currently also parse
// other formats // other formats
let time_milli = js_sys::Date::parse(input_str); let time_milli = js_sys::Date::parse(input_str);

7
proxmox-time/src/week_days.rs
View File

@ -1,10 +1,5 @@
use bitflags::bitflags; use bitflags::bitflags;
use nom::{ use nom::{bytes::complete::tag, character::complete::alpha1, combinator::opt, sequence::pair};
bytes::complete::tag,
character::complete::alpha1,
combinator::opt,
sequence::pair,
};
use crate::parse_helpers::{parse_error, IResult}; use crate::parse_helpers::{parse_error, IResult};