Merge pull request #980 from matthiasbeyer/update-travis

Build with rust stable/beta/nightly

.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

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;
 

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"

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;

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;

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]

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");
 

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;