Bump version

Author: dpc

CHANGELOG.md

@@ -5,6 +5,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## 2.0.0-3.0 - 2017-04-02
+### Changed
+
+* Update dependencies
+
 ## 2.0.0-1.0 - 2017-03-05
 ### Changed
 

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "slog-envlogger"
-version = "2.0.0-1.0"
+version = "2.0.0-3.0"
 authors = ["The Rust Project Developers", "Dawid Ciężarkiewicz <dpc@dpc.pw>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -16,12 +16,12 @@ Port of de facto standard logger implementation for Rust, to `slog-rs` framework
 path = "src/lib.rs"
 
 [dependencies]
-slog = ">= 2.0.0-1.0, < 2.0.0-2"
+slog = "~2.0.0-3"
 regex = "0.1"
-slog-term = ">= 2.0.0-1, < 2.0.0-2"
-slog-stdlog = ">= 2.0.0-0, < 2.0.0-1"
-slog-scope = ">= 2.0.0-1, < 2.0.0-2"
-slog-async = ">= 2.0.0-1, < 2.0.0-2"
+slog-term = "~2.0.0-3"
+slog-stdlog = "~2.0.0-3"
+slog-scope = "~2.0.0-3"
+slog-async = "~2.0.0-3"
 log = "0.3.6"
 
 [[test]]

examples/proper.rs

@@ -5,8 +5,8 @@ extern crate slog_scope;
 extern crate slog_async;
 
 /// Import longer-name versions of macros only to not collide with legacy `log`
-#[macro_use(slog_error, slog_info, slog_trace, slog_log, o, slog_record,
-            slog_record_static, slog_b)]
+#[macro_use(slog_error, slog_info, slog_trace, slog_log, slog_o, slog_record,
+            slog_record_static, slog_b, slog_kv)]
 extern crate slog;
 
 use slog::Drain;
@@ -25,21 +25,19 @@ fn main() {
             ).build().fuse()
         ));
 
-    let root_logger = slog::Logger::root(Arc::new(drain.fuse()), o!("build" => "8jdkj2df", "version" => "0.1.5"));
+    let root_logger = slog::Logger::root(Arc::new(drain.fuse()),
+                                         slog_o!("build" => "8jdkj2df", "version" => "0.1.5"));
 
     slog_stdlog::init().unwrap();
 
     //slog_scope::set_global_logger(root_logger.clone().into_erased());
-    slog_scope::scope(
-        root_logger.clone().into_erased(),
-        || {
-
-            slog_error!(root_logger, "slog error");
-            error!("log error");
-            slog_info!(root_logger, "slog info");
-            info!("log info");
-            slog_trace!(root_logger, "slog trace");
-            trace!("log trace");
-        }
-        );
+    slog_scope::scope(root_logger.clone().into_erased(), || {
+
+        slog_error!(root_logger, "slog error");
+        error!("log error");
+        slog_info!(root_logger, "slog info");
+        info!("log info");
+        slog_trace!(root_logger, "slog trace");
+        trace!("log trace");
+    });
 }

examples/scopes.rs

@@ -2,14 +2,14 @@ extern crate slog_stdlog;
 extern crate slog_envlogger;
 extern crate slog_scope;
 
-#[macro_use(o)]
+#[macro_use(o, kv)]
 extern crate slog;
 
 #[macro_use]
 extern crate log;
 
 fn main() {
-    slog_envlogger::init().unwrap();
+    let _guard = slog_envlogger::init().unwrap();
 
     error!("log error");
 

src/lib.rs

@@ -256,15 +256,17 @@ pub fn new<T : Drain>(d : T) -> EnvLogger<T> {
 /// It's an easy first step, but using `init()` you're not gaining almost
 /// anything that `slog` has to offer, so I highly encourage to use `new()`
 /// instead and explicitly configure your loggers.
-pub fn init() -> std::result::Result<(), log::SetLoggerError> {
+pub fn init() -> std::result::Result<slog_scope::GlobalLoggerGuard, log::SetLoggerError> {
     let drain = slog_term::CompactFormat::new(
         slog_term::TermDecorator::new().stderr().build()
         ).build();
     let drain = new(drain);
     let drain = sync::Mutex::new(drain.fuse());
 
-    slog_scope::set_global_logger(Logger::root(drain.fuse(), o!()).into_erased());
-    slog_stdlog::init()
+    let guard = slog_scope::set_global_logger(Logger::root(drain.fuse(), o!()).into_erased());
+    slog_stdlog::init()?;
+
+    Ok(guard)
 }
 
 /// Parse a logging specification string (e.g: "crate1,crate2::mod3,crate3::x=error/foo")

tests/regexp_filter.rs

@@ -14,7 +14,7 @@ fn main() {
 }
 
 fn child_main() {
-    slog_envlogger::init().unwrap();
+    let _guard =slog_envlogger::init().unwrap();
     info!("XYZ Message");
 }