summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2017-06-21 11:36:18 +0200
committerGitHub <noreply@github.com>2017-06-21 11:36:18 +0200
commitc9d03fc3c2eed003efac9cc1d805a51be69b7cb9 (patch)
tree0ad4b17b2ee65c55958c64e0a4cf9cc51cdc33cd
parent2b7706424a225e89e79b172ae07a6b12ee2ba74a (diff)
parent895065f05fecf0344e0fe318efa5d54be201f89f (diff)
downloadimag-c9d03fc3c2eed003efac9cc1d805a51be69b7cb9.zip
imag-c9d03fc3c2eed003efac9cc1d805a51be69b7cb9.tar.gz
Merge pull request #980 from matthiasbeyer/update-travis
Build with rust stable/beta/nightly
-rw-r--r--.travis.yml7
-rw-r--r--imag-diary/src/main.rs4
-rw-r--r--libimagbookmark/Cargo.toml2
-rw-r--r--libimagbookmark/src/lib.rs2
-rw-r--r--libimagcounter/src/lib.rs2
-rw-r--r--libimagdiary/Cargo.toml1
-rw-r--r--libimagdiary/src/lib.rs3
-rw-r--r--libimagstore/src/lib.rs4
8 files changed, 13 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml
index 9858c85..61d5b72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,16 @@ dist:
language: rust
+rust:
+ - stable
+ - beta
+ - nightly
+
matrix:
include:
- rust: 1.15.0
+ allow_failures:
+ - rust: nightly
cache:
cargo: true
diff --git a/imag-diary/src/main.rs b/imag-diary/src/main.rs
index 71e00cd..844ef3e 100644
--- a/imag-diary/src/main.rs
+++ b/imag-diary/src/main.rs
@@ -40,12 +40,12 @@ extern crate chrono;
extern crate libimagdiary;
extern crate libimagentryedit;
extern crate libimagentrylist;
+extern crate libimagerror;
extern crate libimaginteraction;
extern crate libimagrt;
extern crate libimagstore;
-extern crate libimagutil;
extern crate libimagtimeui;
-#[macro_use] extern crate libimagerror;
+extern crate libimagutil;
use std::process::exit;
diff --git a/libimagbookmark/Cargo.toml b/libimagbookmark/Cargo.toml
index c14962f..5f612a8 100644
--- a/libimagbookmark/Cargo.toml
+++ b/libimagbookmark/Cargo.toml
@@ -14,11 +14,9 @@ repository = "https://github.com/matthiasbeyer/imag"
homepage = "http://imag-pim.org"
[dependencies]
-log = "0.3"
semver = "0.5"
url = "1.2"
regex = "0.1"
-is-match = "0.1"
[dependencies.libimagstore]
path = "../libimagstore"
diff --git a/libimagbookmark/src/lib.rs b/libimagbookmark/src/lib.rs
index 3c1af4c..e576ff1 100644
--- a/libimagbookmark/src/lib.rs
+++ b/libimagbookmark/src/lib.rs
@@ -31,8 +31,6 @@
while_true,
)]
-#[macro_use] extern crate log;
-#[macro_use] extern crate is_match;
extern crate semver;
extern crate url;
extern crate regex;
diff --git a/libimagcounter/src/lib.rs b/libimagcounter/src/lib.rs
index da7d466..09ba178 100644
--- a/libimagcounter/src/lib.rs
+++ b/libimagcounter/src/lib.rs
@@ -34,7 +34,7 @@
extern crate toml;
extern crate toml_query;
#[macro_use] extern crate log;
-#[macro_use] extern crate semver;
+extern crate semver;
#[macro_use] extern crate libimagstore;
#[macro_use] extern crate libimagerror;
diff --git a/libimagdiary/Cargo.toml b/libimagdiary/Cargo.toml
index c0f519f..0f89195 100644
--- a/libimagdiary/Cargo.toml
+++ b/libimagdiary/Cargo.toml
@@ -20,7 +20,6 @@ semver = "0.5"
toml = "0.4.*"
toml-query = "0.2.*"
regex = "0.1"
-lazy_static = "0.2"
itertools = "0.5"
[dependencies.libimagstore]
diff --git a/libimagdiary/src/lib.rs b/libimagdiary/src/lib.rs
index 1dcd496..fcabc94 100644
--- a/libimagdiary/src/lib.rs
+++ b/libimagdiary/src/lib.rs
@@ -35,7 +35,6 @@
extern crate chrono;
#[macro_use] extern crate log;
-#[macro_use] extern crate lazy_static;
extern crate semver;
extern crate toml;
extern crate toml_query;
@@ -43,11 +42,11 @@ extern crate regex;
extern crate itertools;
#[macro_use] extern crate libimagstore;
-#[macro_use] extern crate libimagutil;
#[macro_use] extern crate libimagerror;
extern crate libimagentryedit;
extern crate libimagentryview;
extern crate libimagrt;
+extern crate libimagutil;
module_entry_path_mod!("diary");
diff --git a/libimagstore/src/lib.rs b/libimagstore/src/lib.rs
index b5114f7..ae205b8 100644
--- a/libimagstore/src/lib.rs
+++ b/libimagstore/src/lib.rs
@@ -44,8 +44,8 @@ extern crate crossbeam;
extern crate walkdir;
extern crate itertools;
#[macro_use] extern crate is_match;
-#[macro_use] extern crate serde;
-#[macro_use] extern crate serde_json;
+extern crate serde;
+extern crate serde_json;
#[macro_use] extern crate serde_derive;
#[macro_use] extern crate libimagerror;