Merge pull request #999 from matthiasbeyer/update-chrono

Update chrono

23 files changed, 35 insertions, 35 deletions

diff --git a/imag-diary/Cargo.toml b/imag-diary/Cargo.toml
index 0a6e3048..6f3e01da 100644
--- a/imag-diary/Cargo.toml
+++ b/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"
diff --git a/imag-diary/src/delete.rs b/imag-diary/src/delete.rs
index 7325047b..da44bc92 100644
--- a/imag-diary/src/delete.rs
+++ b/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;
diff --git a/imag-diary/src/edit.rs b/imag-diary/src/edit.rs
index beed8c05..1cd5f9e5 100644
--- a/imag-diary/src/edit.rs
+++ b/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;
diff --git a/libimagdiary/Cargo.toml b/libimagdiary/Cargo.toml
index 751530f8..55ab05e9 100644
--- a/libimagdiary/Cargo.toml
+++ b/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.*"
diff --git a/libimagdiary/src/diary.rs b/libimagdiary/src/diary.rs
index 1a19b052..431b6320 100644
--- a/libimagdiary/src/diary.rs
+++ b/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;
diff --git a/libimagdiary/src/diaryid.rs b/libimagdiary/src/diaryid.rs
index 906097d8..da1afc42 100644
--- a/libimagdiary/src/diaryid.rs
+++ b/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::time::NaiveTime;
-use chrono::naive::date::NaiveDate;
+use chrono::naive::NaiveDateTime;
+use chrono::naive::NaiveTime;
+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();
diff --git a/libimagentrydatetime/Cargo.toml b/libimagentrydatetime/Cargo.toml
index 119487fc..3c58422d 100644
--- a/libimagentrydatetime/Cargo.toml
+++ b/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"
diff --git a/libimagentrydatetime/src/datepath/compiler.rs b/libimagentrydatetime/src/datepath/compiler.rs
index f246eeba..742b594a 100644
--- a/libimagentrydatetime/src/datepath/compiler.rs
+++ b/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::datetime::NaiveDateTime;
+    use chrono::naive::NaiveDate;
+    use chrono::naive::NaiveDateTime;
 
     #[test]
     fn test_compiler_compile_simple() {
diff --git a/libimagentrydatetime/src/datepath/to_store_id.rs b/libimagentrydatetime/src/datepath/to_store_id.rs
index 1d25921b..c781595b 100644
--- a/libimagentrydatetime/src/datepath/to_store_id.rs
+++ b/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;
diff --git a/libimagentrydatetime/src/datetime.rs b/libimagentrydatetime/src/datetime.rs
index 6e7911bf..73c29622 100644
--- a/libimagentrydatetime/src/datetime.rs
+++ b/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::date::NaiveDate;
-    use chrono::naive::time::NaiveTime;
+    use chrono::naive::NaiveDateTime;
+    use chrono::naive::NaiveDate;
+    use chrono::naive::NaiveTime;
 
     pub fn get_store() -> Store {
         Store::new(PathBuf::from("/"), None).unwrap()
diff --git a/libimagentrydatetime/src/range.rs b/libimagentrydatetime/src/range.rs
index 3a94faff..8820b7a3 100644
--- a/libimagentrydatetime/src/range.rs
+++ b/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::date::NaiveDate;
-    use chrono::naive::time::NaiveTime;
+    use chrono::naive::NaiveDateTime;
+    use chrono::naive::NaiveDate;
+    use chrono::naive::NaiveTime;
 
     use super::DateTimeRange;
 
diff --git a/libimagentrytimetrack/Cargo.toml b/libimagentrytimetrack/Cargo.toml
index 7be71719..316af990 100644
--- a/libimagentrytimetrack/Cargo.toml
+++ b/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"
diff --git a/libimagentrytimetrack/src/iter/create.rs b/libimagentrytimetrack/src/iter/create.rs
index bbaba197..0c471aa8 100644
--- a/libimagentrytimetrack/src/iter/create.rs
+++ b/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;
diff --git a/libimagentrytimetrack/src/iter/mod.rs b/libimagentrytimetrack/src/iter/mod.rs
index d2d78cd9..467199d8 100644
--- a/libimagentrytimetrack/src/iter/mod.rs
+++ b/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;
 
diff --git a/libimagentrytimetrack/src/iter/setendtime.rs b/libimagentrytimetrack/src/iter/setendtime.rs
index 3a48491c..89eb382b 100644
--- a/libimagentrytimetrack/src/iter/setendtime.rs
+++ b/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;
diff --git a/libimagentrytimetrack/src/iter/storeid.rs b/libimagentrytimetrack/src/iter/storeid.rs
index ac44c3c6..a3071908 100644
--- a/libimagentrytimetrack/src/iter/storeid.rs
+++ b/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;
diff --git a/libimagentrytimetrack/src/iter/tag.rs b/libimagentrytimetrack/src/iter/tag.rs
index 5f0c9d57..da006d8b 100644
--- a/libimagentrytimetrack/src/iter/tag.rs
+++ b/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;
diff --git a/libimagentrytimetrack/src/timetracking.rs b/libimagentrytimetrack/src/timetracking.rs
index a2d21e04..625238dd 100644
--- a/libimagentrytimetrack/src/timetracking.rs
+++ b/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;
diff --git a/libimagentrytimetrack/src/timetrackingstore.rs b/libimagentrytimetrack/src/timetrackingstore.rs
index 1791df87..9312a1c7 100644
--- a/libimagentrytimetrack/src/timetrackingstore.rs
+++ b/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()
 }
 
diff --git a/libimagtimeui/Cargo.toml b/libimagtimeui/Cargo.toml
index d8491e9b..deb74124 100644
--- a/libimagtimeui/Cargo.toml
+++ b/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"
 
diff --git a/libimagtimeui/src/date.rs b/libimagtimeui/src/date.rs
index 817ec6e1..6e87035b 100644
--- a/libimagtimeui/src/date.rs
+++ b/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;
 
diff --git a/libimagtimeui/src/datetime.rs b/libimagtimeui/src/datetime.rs
index be718794..03929106 100644
--- a/libimagtimeui/src/datetime.rs
+++ b/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;
diff --git a/libimagtimeui/src/time.rs b/libimagtimeui/src/time.rs
index 1e52fbd3..8c37b07c 100644
--- a/libimagtimeui/src/time.rs
+++ b/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;