summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2017-07-17 14:03:16 +0200
committerGitHub <noreply@github.com>2017-07-17 14:03:16 +0200
commit3767d8d38f81b2ec0382a3576811820179e3d249 (patch)
treef19a8d5c710c715bc34729dfd864131385fc34da
parent3c07f47c4ae6c9a74958200b018646233fce23fe (diff)
parent9ab29bc37aebefb8597a23c8abf5379add3ab9e7 (diff)
downloadimag-3767d8d38f81b2ec0382a3576811820179e3d249.zip
imag-3767d8d38f81b2ec0382a3576811820179e3d249.tar.gz
Merge pull request #999 from matthiasbeyer/update-chrono
Update chrono
-rw-r--r--imag-diary/Cargo.toml2
-rw-r--r--imag-diary/src/delete.rs2
-rw-r--r--imag-diary/src/edit.rs2
-rw-r--r--libimagdiary/Cargo.toml2
-rw-r--r--libimagdiary/src/diary.rs4
-rw-r--r--libimagdiary/src/diaryid.rs8
-rw-r--r--libimagentrydatetime/Cargo.toml2
-rw-r--r--libimagentrydatetime/src/datepath/compiler.rs6
-rw-r--r--libimagentrydatetime/src/datepath/to_store_id.rs2
-rw-r--r--libimagentrydatetime/src/datetime.rs8
-rw-r--r--libimagentrydatetime/src/range.rs8
-rw-r--r--libimagentrytimetrack/Cargo.toml2
-rw-r--r--libimagentrytimetrack/src/iter/create.rs2
-rw-r--r--libimagentrytimetrack/src/iter/mod.rs2
-rw-r--r--libimagentrytimetrack/src/iter/setendtime.rs2
-rw-r--r--libimagentrytimetrack/src/iter/storeid.rs2
-rw-r--r--libimagentrytimetrack/src/iter/tag.rs2
-rw-r--r--libimagentrytimetrack/src/timetracking.rs2
-rw-r--r--libimagentrytimetrack/src/timetrackingstore.rs2
-rw-r--r--libimagtimeui/Cargo.toml2
-rw-r--r--libimagtimeui/src/date.rs2
-rw-r--r--libimagtimeui/src/datetime.rs2
-rw-r--r--libimagtimeui/src/time.rs2
23 files changed, 35 insertions, 35 deletions
diff --git a/imag-diary/Cargo.toml b/imag-diary/Cargo.toml
index 0a6e304..6f3e01d 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 7325047..da44bc9 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 beed8c0..1cd5f9e 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 751530f..55ab05e 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 1a19b05..431b632 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 906097d..da1afc4 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 119487f..3c58422 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 f246eeb..742b594 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 1d25921..c781595 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 6e7911b..73c2962 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 3a94faf..8820b7a 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 7be7171..316af99 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 bbaba19..0c471aa 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 d2d78cd..467199d 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 3a48491..89eb382 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 ac44c3c..a307190 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 5f0c9d5..da006d8 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 a2d21e0..625238d 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 1791df8..9312a1c 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 d8491e9..deb7412 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 817ec6e..6e87035 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 be71879..0392910 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 1e52fbd..8c37b07 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;