Matthias Beyer
1d89844613
With this patch we move the codebase to Rust-2018.
The diff was generated by executing
cargo fix --all --all-features --edition
on the codebase.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
64 lines
1.6 KiB
Rust
64 lines
1.6 KiB
Rust
//
|
|
// imag - the personal information management suite for the commandline
|
|
// Copyright (C) 2015-2019 Matthias Beyer <mail@beyermatthias.de> and contributors
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; version
|
|
// 2.1 of the License.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
//
|
|
|
|
use chrono::naive::NaiveDateTime as ChronoNaiveDateTime;
|
|
|
|
use crate::parse::Parse;
|
|
use crate::date::Date;
|
|
use crate::time::Time;
|
|
|
|
pub struct DateTime {
|
|
date: Date,
|
|
time: Time,
|
|
}
|
|
|
|
impl DateTime {
|
|
|
|
pub fn new(date: Date, time: Time) -> DateTime {
|
|
DateTime { date, time }
|
|
}
|
|
|
|
pub fn date(&self) -> &Date {
|
|
&self.date
|
|
}
|
|
|
|
pub fn time(&self) -> &Time {
|
|
&self.time
|
|
}
|
|
|
|
}
|
|
|
|
impl Into<ChronoNaiveDateTime> for DateTime {
|
|
|
|
fn into(self) -> ChronoNaiveDateTime {
|
|
ChronoNaiveDateTime::new(self.date.into(), self.time.into())
|
|
}
|
|
|
|
}
|
|
|
|
impl Parse for DateTime {
|
|
|
|
fn parse(s: &str) -> Option<DateTime> {
|
|
Date::parse(s)
|
|
.and_then(|d| Time::parse(s).map(|t| (d, t)))
|
|
.map(|(d, t)| DateTime::new(d, t))
|
|
}
|
|
|
|
}
|
|
|