Upgrade to slog v2.8

Implement Drain::flush and enable the `nested-values` feature by default.

Author: Techcable

CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+* Upgrade to [slog v2.8.0].
+  * Enable `nested-values` feature by default
+  * Increase MSRV to 1.61 (same as slog)
+
+### Added
+* Implement `Drain::flush` (new in [slog v2.8.0])
+
+[slog v2.8.0]: https://github.com/slog-rs/slog/releases/v2.8.0
 
 ## 2.6.0 - 2022-02-20
 ### Changed

Cargo.toml

@@ -15,24 +15,23 @@ readme = "README.md"
 # Please do not bump this unnecessarily.
 # Changing this should bump the minor version for semver (2.x for semver).
 #
-# The first version of Cargo that supports this field was in Rust 1.56.0.
-# In older releases, the field will be ignored, and Cargo will display a warning.
-rust-version = "1.53"
+# This currently matches the MSRV of slog
+rust-version = "1.61"
 
 [features]
-nested-values = ["erased-serde", "slog/nested-values"]
+default = ["nested-values"]
+nested-values = ["dep:erased-serde", "slog/nested-values"]
 dynamic-keys = ["slog/dynamic-keys"]
-default = []
 
 [dependencies]
-slog = { version = "2.1.1" }
+slog = "2.8"
 serde_json = "1"
 serde = "1"
-erased-serde = {version = "0.3", optional = true }
+erased-serde = { version = "0.4", optional = true }
 time = { version = "0.3.6", features = ["formatting"] }
 
 [dev-dependencies]
 slog-async = "2"
 
 [package.metadata.docs.rs]
-features = ["nested-values", "dynamic-keys"]
+features = ["dynamic-keys"]

src/lib.rs

@@ -23,7 +23,6 @@
 extern crate slog;
 
 use serde::ser::SerializeMap;
-use serde::serde_if_integer128;
 use slog::Key;
 use slog::Record;
 use slog::{FnValue, PushFnValue};
@@ -132,13 +131,11 @@ where
     fn emit_f64(&mut self, key: Key, val: f64) -> slog::Result {
         impl_m!(self, key, &val)
     }
-    serde_if_integer128! {
-        fn emit_u128(&mut self, key: Key, val: u128) -> slog::Result {
-            impl_m!(self, key, &val)
-        }
-        fn emit_i128(&mut self, key: Key, val: i128) -> slog::Result {
-            impl_m!(self, key, &val)
-        }
+    fn emit_u128(&mut self, key: Key, val: u128) -> slog::Result {
+        impl_m!(self, key, &val)
+    }
+    fn emit_i128(&mut self, key: Key, val: i128) -> slog::Result {
+        impl_m!(self, key, &val)
     }
     fn emit_str(&mut self, key: Key, val: &str) -> slog::Result {
         impl_m!(self, key, &val)
@@ -193,7 +190,7 @@ where
     }
 
     /// Build custom `Json` `Drain`
-    #[cfg_attr(feature = "cargo-clippy", allow(clippy::new_ret_no_self))]
+    #[allow(clippy::new_ret_no_self)]
     pub fn new(io: W) -> JsonBuilder<W> {
         JsonBuilder::new(io)
     }
@@ -254,6 +251,11 @@ where
         }
         Ok(())
     }
+
+    fn flush(&self) -> Result<(), slog::FlushError> {
+        let mut io = self.io.borrow_mut();
+        io.flush().map_err(slog::FlushError::from)
+    }
 }
 
 // }}}