Merge pull request #142 from KodrAus/feat/2018

Update to 2018 edition

.travis.yml

@@ -1,7 +1,7 @@
 language: rust
 sudo: false
 rust:
-  - 1.28.0
+  - 1.31.0
   - stable
   - beta
   - nightly

Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "env_logger"
+edition = "2018"
 version = "0.6.2" # remember to update html_root_url
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
@@ -19,7 +20,7 @@ members = [
 ]
 
 [dependencies]
-log = { version = "0.4", features = ["std"] }
+log = { version = "0.4.8", features = ["std"] }
 regex = { version = "1.0.3", optional = true }
 termcolor = { version = "1.0.2", optional = true }
 humantime = { version = "1.3", optional = true }

README.md

@@ -24,7 +24,6 @@ env_logger = "0.6.2"
 ```rust
 #[macro_use]
 extern crate log;
-extern crate env_logger;
 
 fn main() {
     env_logger::init();
@@ -69,7 +68,6 @@ fn add_one(num: i32) -> i32 {
 #[cfg(test)]
 mod tests {
     use super::*;
-    extern crate env_logger;
 
     fn init() {
         let _ = env_logger::builder().is_test(true).try_init();

ci/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "ci"
+edition = "2018"
 version = "0.0.0"
 authors = ["The Rust Project Developers"]
 publish = false

ci/src/main.rs

@@ -1,13 +1,8 @@
-mod task;
 mod permute;
+mod task;
 
 fn main() {
-    let features = [
-        "termcolor",
-        "humantime",
-        "atty",
-        "regex",
-    ];
+    let features = ["termcolor", "humantime", "atty", "regex"];
 
     // Run a default build
     if !task::test(Default::default()) {
@@ -25,12 +20,13 @@ fn main() {
     // Run a set of permutations
     let failed = permute::all(&features)
         .into_iter()
-        .filter(|features| 
+        .filter(|features| {
             !task::test(task::TestArgs {
                 features: features.clone(),
                 default_features: false,
                 lib_only: true,
-            }))
+            })
+        })
         .collect::<Vec<_>>();
 
     if failed.len() > 0 {

ci/src/permute.rs

@@ -1,6 +1,9 @@
 use std::collections::BTreeSet;
 
-pub fn all<T>(input: &[T]) -> BTreeSet<BTreeSet<T>> where T: Ord + Eq + Clone {
+pub fn all<T>(input: &[T]) -> BTreeSet<BTreeSet<T>>
+where
+    T: Ord + Eq + Clone,
+{
     let mut permutations = BTreeSet::new();
 
     if input.len() == 0 {

ci/src/task.rs

@@ -1,8 +1,5 @@
 use std::collections::BTreeSet;
-use std::process::{
-    Command,
-    Stdio,
-};
+use std::process::{Command, Stdio};
 
 pub type Feature = &'static str;
 
@@ -45,7 +42,7 @@ pub fn test(args: TestArgs) -> bool {
     let features = args.features_string();
 
     let mut command = Command::new("cargo");
-        
+
     command
         .stdout(Stdio::inherit())
         .stderr(Stdio::inherit())
@@ -65,13 +62,14 @@ pub fn test(args: TestArgs) -> bool {
     }
 
     println!("running {:?}", command);
-
-    let status = command
-        .status()
-        .expect("Failed to execute command");
+
+    let status = command.status().expect("Failed to execute command");
 
     if !status.success() {
-        eprintln!("test execution failed for features: {}", features.as_ref().map(AsRef::as_ref).unwrap_or(""));
+        eprintln!(
+            "test execution failed for features: {}",
+            features.as_ref().map(AsRef::as_ref).unwrap_or("")
+        );
         false
     } else {
         true

examples/custom_default_format.rs

@@ -19,9 +19,8 @@ If you want to control the logging output completely, see the `custom_logger` ex
 
 #[macro_use]
 extern crate log;
-extern crate env_logger;
 
-use env_logger::{Env, Builder};
+use env_logger::{Builder, Env};
 
 fn init_logger() {
     let env = Env::default()
@@ -30,9 +29,7 @@ fn init_logger() {
 
     let mut builder = Builder::from_env(env);
 
-    builder
-        .default_format_level(false)
-        .default_format_timestamp_nanos(true);
+    builder.format_level(false).format_timestamp_nanos();
 
     builder.init();
 }

examples/custom_format.rs

@@ -17,38 +17,37 @@ $ export MY_LOG_STYLE=never
 If you want to control the logging output completely, see the `custom_logger` example.
 */
 
-#[macro_use]
-extern crate log;
-extern crate env_logger;
-
-use std::io::Write;
-
-use env_logger::{Env, Builder, fmt};
-
-fn init_logger() {
-    let env = Env::default()
-        .filter("MY_LOG_LEVEL")
-        .write_style("MY_LOG_STYLE");
-
-    let mut builder = Builder::from_env(env);
-
-    // Use a different format for writing log records
-    // The colors are only available when the `termcolor` dependency is (which it is by default)
-    #[cfg(feature = "termcolor")]
-    builder.format(|buf, record| {
-        let mut style = buf.style();
-        style.set_bg(fmt::Color::Yellow).set_bold(true);
-
-        let timestamp = buf.timestamp();
-
-        writeln!(buf, "My formatted log ({}): {}", timestamp, style.value(record.args()))
-    });
-
-    builder.init();
-}
-
+#[cfg(all(feature = "termcolor", feature = "humantime"))]
 fn main() {
+    use env_logger::{fmt, Builder, Env};
+    use std::io::Write;
+
+    fn init_logger() {
+        let env = Env::default()
+            .filter("MY_LOG_LEVEL")
+            .write_style("MY_LOG_STYLE");
+
+        Builder::from_env(env)
+            .format(|buf, record| {
+                let mut style = buf.style();
+                style.set_bg(fmt::Color::Yellow).set_bold(true);
+
+                let timestamp = buf.timestamp();
+
+                writeln!(
+                    buf,
+                    "My formatted log ({}): {}",
+                    timestamp,
+                    style.value(record.args())
+                )
+            })
+            .init();
+    }
+
     init_logger();
 
-    info!("a log from `MyLogger`");
+    log::info!("a log from `MyLogger`");
 }
+
+#[cfg(not(all(feature = "termcolor", feature = "humantime")))]
+fn main() {}

examples/custom_logger.rs

@@ -12,12 +12,12 @@ If you only want to change the way logs are formatted, look at the `custom_forma
 
 #[macro_use]
 extern crate log;
-extern crate env_logger;
+
 use env_logger::filter::Filter;
 use log::{Log, Metadata, Record, SetLoggerError};
 
 struct MyLogger {
-    inner: Filter
+    inner: Filter,
 }
 
 impl MyLogger {
@@ -26,7 +26,7 @@ impl MyLogger {
         let mut builder = Builder::from_env("MY_LOG_LEVEL");
 
         MyLogger {
-            inner: builder.build()
+            inner: builder.build(),
         }
     }
 
@@ -50,7 +50,7 @@ impl Log for MyLogger {
         }
     }
 
-    fn flush(&self) { }
+    fn flush(&self) {}
 }
 
 fn main() {

examples/default.rs

@@ -17,7 +17,6 @@ $ export MY_LOG_STYLE=never
 
 #[macro_use]
 extern crate log;
-extern crate env_logger;
 
 use env_logger::Env;
 

examples/direct_logger.rs

@@ -4,9 +4,6 @@ Using `env_logger::Logger` and the `log::Log` trait directly.
 This example doesn't rely on environment variables, or having a static logger installed.
 */
 
-extern crate log;
-extern crate env_logger;
-
 fn record() -> log::Record<'static> {
     let error_metadata = log::MetadataBuilder::new()
         .target("myApp")
@@ -34,7 +31,7 @@ fn main() {
         .filter(None, log::LevelFilter::Error)
         .write_style(env_logger::WriteStyle::Never)
         .build();
-    
+
     stylish_logger.log(&record());
     unstylish_logger.log(&record());
-}
+}

examples/filters_from_code.rs

@@ -4,7 +4,6 @@ Specify logging filters in code instead of using an environment variable.
 
 #[macro_use]
 extern crate log;
-extern crate env_logger;
 
 fn main() {
     env_logger::builder()