Update to log's stable kv feature

Cargo.toml

@@ -23,7 +23,7 @@ timestamp = []
 nightly   = []
 
 [dependencies]
-log        = { version = "0.4.16", default-features = false, features = ["kv_unstable_std"] }
+log        = { version = "0.4.21", default-features = false, features = ["kv_std"] }
 itoa       = { version = "1.0.1", default-features = false }
 ryu        = { version = "1.0.5", default-features = false }
 

src/config.rs

@@ -166,7 +166,7 @@ fn log_panic(info: &std::panic::PanicInfo<'_>) {
     let backtrace = Backtrace::force_capture();
 
     let key_values = [
-        ("backtrace", kv::Value::capture_display(&backtrace)),
+        ("backtrace", kv::Value::from_display(&backtrace)),
         ("thread_name", kv::Value::from(thread_name)),
     ];
     let key_values = key_values.as_slice();
@@ -195,7 +195,10 @@ fn log_panic(info: &std::panic::PanicInfo<'_>) {
 pub struct NoKvs;
 
 impl kv::Source for NoKvs {
-    fn visit<'kvs>(&'kvs self, _: &mut dyn log::kv::Visitor<'kvs>) -> Result<(), log::kv::Error> {
+    fn visit<'kvs>(
+        &'kvs self,
+        _: &mut dyn log::kv::VisitSource<'kvs>,
+    ) -> Result<(), log::kv::Error> {
         Ok(())
     }
 

src/format/json.rs

@@ -3,7 +3,7 @@
 use std::fmt::{self, Write};
 use std::io::IoSlice;
 
-use log::kv::value::Visit;
+use log::kv::{VisitSource, VisitValue};
 use log::{kv, Record};
 
 #[cfg(feature = "timestamp")]
@@ -153,7 +153,7 @@ fn line(buf: &Buffer) -> &[u8] {
 /// `"user_name":"Thomas","user_id":123,"is_admin":true`.
 pub(super) struct KeyValueVisitor<'b>(pub(super) &'b mut Vec<u8>);
 
-impl<'b, 'kvs> kv::Visitor<'kvs> for KeyValueVisitor<'b> {
+impl<'b, 'kvs> VisitSource<'kvs> for KeyValueVisitor<'b> {
     fn visit_pair(&mut self, key: kv::Key<'kvs>, value: kv::Value<'kvs>) -> Result<(), kv::Error> {
         self.0.push(b',');
         self.0.push(b'"');
@@ -164,7 +164,7 @@ impl<'b, 'kvs> kv::Visitor<'kvs> for KeyValueVisitor<'b> {
     }
 }
 
-impl<'b, 'v> Visit<'v> for KeyValueVisitor<'b> {
+impl<'b, 'v> VisitValue<'v> for KeyValueVisitor<'b> {
     fn visit_any(&mut self, value: kv::Value) -> Result<(), kv::Error> {
         self.0.push(b'\"');
         Buf(self.0)

src/format/logfmt.rs

@@ -3,7 +3,7 @@
 use std::fmt::{self, Write};
 use std::io::IoSlice;
 
-use log::kv::value::Visit;
+use log::kv::{VisitSource, VisitValue};
 use log::{kv, Record};
 
 #[cfg(feature = "timestamp")]
@@ -142,7 +142,7 @@ fn line(buf: &Buffer) -> &[u8] {
 /// `user_name="Thomas" user_id=123 is_admin=true`
 struct KeyValueVisitor<'b>(&'b mut Vec<u8>);
 
-impl<'b, 'kvs> kv::Visitor<'kvs> for KeyValueVisitor<'b> {
+impl<'b, 'kvs> VisitSource<'kvs> for KeyValueVisitor<'b> {
     fn visit_pair(&mut self, key: kv::Key<'kvs>, value: kv::Value<'kvs>) -> Result<(), kv::Error> {
         self.0.push(b' ');
         Buf(self.0).extend_from_slice(key.as_str().as_bytes());
@@ -151,7 +151,7 @@ impl<'b, 'kvs> kv::Visitor<'kvs> for KeyValueVisitor<'b> {
     }
 }
 
-impl<'b, 'v> Visit<'v> for KeyValueVisitor<'b> {
+impl<'b, 'v> VisitValue<'v> for KeyValueVisitor<'b> {
     fn visit_any(&mut self, value: kv::Value) -> Result<(), kv::Error> {
         self.0.push(b'\"');
         Buf(self.0)

src/lib.rs

@@ -273,7 +273,7 @@
 //!     request!(
 //!         url = req.url,
 //!         status = req.status,
-//!         response_time = log::as_debug!(req.response_time);
+//!         response_time:? = req.response_time;
 //!         "HTTP request"
 //!     );
 //! }

src/tests.rs

@@ -254,7 +254,10 @@ where
         ("key2e", &true),
         ("key2f", &false),
         ("key2g", &'c'),
-        ("key2\"g", &(&MyDisplay as &dyn fmt::Display)),
+        (
+            "key2\"g",
+            &(&log::kv::Value::from_display(&MyDisplay) as &dyn kv::ToValue),
+        ),
     ];
     let kvs: &dyn kv::Source = &kvs;
     let record2 = Record::builder()