Rename the new_time function
This commit is contained in:
parent
3a82cd229d
commit
972b045b21
|
@ -20,16 +20,16 @@ pub struct SunMoon {
|
||||||
|
|
||||||
impl SunMoon {
|
impl SunMoon {
|
||||||
fn from_js(day: Date<Tz>, val: SunMoonJs) -> Self {
|
fn from_js(day: Date<Tz>, val: SunMoonJs) -> Self {
|
||||||
fn kreu_tempo(day: Date<Tz>, val: String) -> Option<DateTime<Tz>> {
|
fn new_time(day: Date<Tz>, val: String) -> Option<DateTime<Tz>> {
|
||||||
NaiveTime::parse_from_str(&val, "%H:%M")
|
NaiveTime::parse_from_str(&val, "%H:%M")
|
||||||
.map(|tempo| day.and_hms(tempo.hour(), tempo.minute(), 0))
|
.map(|tempo| day.and_hms(tempo.hour(), tempo.minute(), 0))
|
||||||
.ok()
|
.ok()
|
||||||
}
|
}
|
||||||
|
|
||||||
let sunrise = kreu_tempo(day.clone(), val.sunrise).unwrap();
|
let sunrise = new_time(day.clone(), val.sunrise).unwrap();
|
||||||
let sunset = kreu_tempo(day.clone(), val.sunset).unwrap();
|
let sunset = new_time(day.clone(), val.sunset).unwrap();
|
||||||
let moonrise = val.moonrise.and_then(|v| kreu_tempo(day.clone(), v));
|
let moonrise = val.moonrise.and_then(|v| new_time(day.clone(), v));
|
||||||
let moonset = val.moonset.and_then(|v| kreu_tempo(day.clone(), v));
|
let moonset = val.moonset.and_then(|v| new_time(day.clone(), v));
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
sunrise,
|
sunrise,
|
||||||
|
|
Loading…
Reference in New Issue