Merge pull request #999 from matthiasbeyer/update-chrono

Update chrono

imag-diary/Cargo.toml

@@ -14,7 +14,7 @@ repository    = "https://github.com/matthiasbeyer/imag"
 homepage      = "http://imag-pim.org"
 
 [dependencies]
-chrono = "0.2"
+chrono = "0.4"
 version = "2.0"
 clap = "2.*"
 log = "0.3"

imag-diary/src/delete.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 
 use libimagdiary::diary::Diary;
 use libimagdiary::diaryid::DiaryId;

imag-diary/src/edit.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 
 use libimagdiary::diary::Diary;
 use libimagdiary::diaryid::DiaryId;

libimagdiary/Cargo.toml

@@ -14,7 +14,7 @@ repository    = "https://github.com/matthiasbeyer/imag"
 homepage      = "http://imag-pim.org"
 
 [dependencies]
-chrono = "0.2"
+chrono = "0.4"
 log = "0.3"
 semver = "0.5"
 toml = "0.4.*"

libimagdiary/src/diary.rs

@@ -23,10 +23,10 @@ use libimagstore::store::Store;
 use libimagstore::storeid::IntoStoreId;
 use libimagerror::trace::trace_error;
 
-use chrono::offset::local::Local;
+use chrono::offset::Local;
 use chrono::Datelike;
 use itertools::Itertools;
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 
 use entry::Entry;
 use diaryid::DiaryId;

libimagdiary/src/diaryid.rs

@@ -20,9 +20,9 @@
 use std::convert::Into;
 use std::fmt::{Display, Formatter, Error as FmtError};
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
-use chrono::naive::time::NaiveTime;
+use chrono::naive::NaiveTime;
-use chrono::naive::date::NaiveDate;
+use chrono::naive::NaiveDate;
 use chrono::Datelike;
 use chrono::Timelike;
 
@@ -119,7 +119,7 @@ impl DiaryId {
     }
 
     pub fn now(name: String) -> DiaryId {
-        use chrono::offset::local::Local;
+        use chrono::offset::Local;
 
         let now = Local::now();
         let now_date = now.date().naive_local();

libimagentrydatetime/Cargo.toml

@@ -14,7 +14,7 @@ repository    = "https://github.com/matthiasbeyer/imag"
 homepage      = "http://imag-pim.org"
 
 [dependencies]
-chrono = "0.3"
+chrono = "0.4"
 toml-query = "0.3"
 lazy_static = "0.2"
 toml = "0.4"

libimagentrydatetime/src/datepath/compiler.rs

@@ -19,7 +19,7 @@
 
 use std::path::PathBuf;
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 use chrono::Datelike;
 use chrono::Timelike;
 
@@ -133,8 +133,8 @@ mod test {
     use datepath::accuracy::Accuracy;
     use datepath::format::Format;
 
-    use chrono::naive::date::NaiveDate;
+    use chrono::naive::NaiveDate;
-    use chrono::naive::datetime::NaiveDateTime;
+    use chrono::naive::NaiveDateTime;
 
     #[test]
     fn test_compiler_compile_simple() {

libimagentrydatetime/src/datepath/to_store_id.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 
 use libimagstore::storeid::StoreId;
 use datepath::result::Result;

libimagentrydatetime/src/datetime.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 use toml_query::delete::TomlValueDeleteExt;
 use toml_query::insert::TomlValueInsertExt;
 use toml_query::read::TomlValueReadExt;
@@ -219,9 +219,9 @@ mod tests {
 
     use libimagstore::store::Store;
 
-    use chrono::naive::datetime::NaiveDateTime;
+    use chrono::naive::NaiveDateTime;
-    use chrono::naive::date::NaiveDate;
+    use chrono::naive::NaiveDate;
-    use chrono::naive::time::NaiveTime;
+    use chrono::naive::NaiveTime;
 
     pub fn get_store() -> Store {
         Store::new(PathBuf::from("/"), None).unwrap()

libimagentrydatetime/src/range.rs

@@ -38,7 +38,7 @@ pub mod result {
     pub type Result<T> = RResult<T, DateTimeRangeError>;
 }
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 use libimagerror::into::IntoError;
 use self::result::Result;
 
@@ -69,9 +69,9 @@ impl DateTimeRange {
 #[cfg(test)]
 mod tests {
 
-    use chrono::naive::datetime::NaiveDateTime;
+    use chrono::naive::NaiveDateTime;
-    use chrono::naive::date::NaiveDate;
+    use chrono::naive::NaiveDate;
-    use chrono::naive::time::NaiveTime;
+    use chrono::naive::NaiveTime;
 
     use super::DateTimeRange;
 

libimagentrytimetrack/Cargo.toml

@@ -15,7 +15,7 @@ homepage      = "http://imag-pim.org"
 
 [dependencies]
 filters = "0.1"
-chrono = "0.3"
+chrono = "0.4"
 toml = "0.4"
 toml-query = "0.3"
 lazy_static = "0.2"

libimagentrytimetrack/src/iter/create.rs

@@ -19,7 +19,7 @@
 
 use toml::Value;
 use toml_query::insert::TomlValueInsertExt;
-use chrono::naive::datetime::NaiveDateTime as NDT;
+use chrono::naive::NaiveDateTime as NDT;
 
 use constants::*;
 use error::TimeTrackError as TTE;

libimagentrytimetrack/src/iter/mod.rs

@@ -26,7 +26,7 @@ pub mod tag;
 
 #[cfg(test)]
 mod test {
-    use chrono::naive::date::NaiveDate;
+    use chrono::naive::NaiveDate;
 
     use libimagstore::store::Store;
 

libimagentrytimetrack/src/iter/setendtime.rs

@@ -19,7 +19,7 @@
 
 use toml::Value;
 use toml_query::insert::TomlValueInsertExt;
-use chrono::naive::datetime::NaiveDateTime as NDT;
+use chrono::naive::NaiveDateTime as NDT;
 
 use constants::*;
 use error::TimeTrackError as TTE;

libimagentrytimetrack/src/iter/storeid.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::datetime::NaiveDateTime as NDT;
+use chrono::naive::NaiveDateTime as NDT;
 
 use constants::*;
 use error::TimeTrackError;

libimagentrytimetrack/src/iter/tag.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::datetime::NaiveDateTime as NDT;
+use chrono::naive::NaiveDateTime as NDT;
 
 use error::TimeTrackError;
 use error::TimeTrackErrorKind as TTEK;

libimagentrytimetrack/src/timetracking.rs

@@ -24,7 +24,7 @@
 //! getting the start and end time and also deleting start and end time.
 //!
 
-use chrono::naive::datetime::NaiveDateTime;
+use chrono::naive::NaiveDateTime;
 
 use libimagstore::store::Entry;
 use libimagerror::into::IntoError;

libimagentrytimetrack/src/timetrackingstore.rs

@@ -48,7 +48,7 @@ pub trait TimeTrackStore<'a> {
 }
 
 fn now() -> NDT {
-    use chrono::offset::local::Local;
+    use chrono::offset::Local;
     Local::now().naive_local()
 }
 

libimagtimeui/Cargo.toml

@@ -17,6 +17,6 @@ homepage      = "http://imag-pim.org"
 clap = ">=2.17"
 lazy_static = "0.2"
 log = "0.3"
-chrono = "0.2"
+chrono = "0.4"
 regex = "0.2"
 

libimagtimeui/src/date.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::date::NaiveDate as ChronoNaiveDate;
+use chrono::naive::NaiveDate as ChronoNaiveDate;
 
 use parse::Parse;
 

libimagtimeui/src/datetime.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::datetime::NaiveDateTime as ChronoNaiveDateTime;
+use chrono::naive::NaiveDateTime as ChronoNaiveDateTime;
 
 use parse::Parse;
 use date::Date;

libimagtimeui/src/time.rs

@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use chrono::naive::time::NaiveTime as ChronoNaiveTime;
+use chrono::naive::NaiveTime as ChronoNaiveTime;
 
 use parse::Parse;