chore: update with latest log crate

Author: zensh

.github/workflows/ci.yml

@@ -13,12 +13,7 @@ jobs:
         toolchain: [stable, nightly]
     continue-on-error: true
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: false
-        components: rustfmt, clippy
+    - uses: actions/checkout@v4
     - name: Run clippy
       run: cargo clippy --all-targets --all-features
     - name: Run tests

.github/workflows/publish.yml

@@ -7,29 +7,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: nightly
-        override: true
-        components: rustfmt, clippy
-    - uses: actions-rs/cargo@v1
-      with:
-        command: test
-        args: --all-features --no-fail-fast -- --nocapture --test-threads=1
-      env:
-        CARGO_INCREMENTAL: '0'
-        RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-        RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests'
-    - uses: actions-rs/[email protected]
-    - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v3
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        files: ${{ steps.coverage.outputs.report }}
-        flags: unittests
-        name: codecov-umbrella
-        verbose: true
+    - uses: actions/checkout@v4
     - uses: katyo/publish-crates@v2
       with:
         registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "structured-logger"
-version = "1.0.3"
+version = "1.0.4"
 edition = "2018"
 description = """
 A logging implementation for the log crate that logs structured values either synchronous or asynchronous, as JSON, CBOR, or any other format, into a file, stderr, stdout, or any other destination.
@@ -26,13 +26,11 @@ default = ["log-panic"]
 log-panic = []
 
 [dependencies]
-log = { version = "0.4", features = [
-  "kv_unstable_serde",
-], default-features = false }
+log = { version = "0.4", features = ["kv_serde"], default-features = false }
 parking_lot = { version = "0.12", optional = false }
-serde = { version = "1.0", features = ["derive"], default-features = false }
-serde_json = { version = "1.0", features = ["std"], default-features = false }
-tokio = { version = "1.29", features = [
+serde = { version = "1", features = ["derive"], default-features = false }
+serde_json = { version = "1", features = ["std"], default-features = false }
+tokio = { version = "1", features = [
   "io-std",
   "io-util",
   "parking_lot",
@@ -41,5 +39,5 @@ tokio = { version = "1.29", features = [
 ], default-features = false }
 
 [dev-dependencies]
-tokio = { version = "1.29", features = ["full"] }
-gag = { version = "1.0" }
+tokio = { version = "1", features = ["full"] }
+gag = { version = "1" }

Makefile

@@ -10,6 +10,9 @@ lint:
 	@cargo fmt
 	@cargo clippy --all-targets --all-features
 
+fix:
+	@cargo clippy --fix --workspace --tests
+
 test:
 	@cargo fmt
 	@cargo clippy --all-targets --all-features

README.md

@@ -44,7 +44,7 @@ async fn main() {
         status = 200_u16,
         start = unix_ms(),
         elapsed = 10_u64,
-        kv = log::as_serde!(kv);
+        kv:serde = kv;
         "",
     );
     // This log will be written to stdout:

examples/async_log.rs

@@ -27,7 +27,7 @@ async fn main() {
             status = 200_u16,
             start = unix_ms(),
             elapsed = 10_u64,
-            kv = log::as_serde!(kv);
+            kv:serde = kv;
             "",
         );
         // This log will be written to tokio stdout (async writer):

examples/custom.rs

@@ -34,7 +34,7 @@ fn main() {
         status = 200_u16,
         start = unix_ms(),
         elapsed = 10_u64,
-        kv = log::as_serde!(kv);
+        kv:serde = kv;
         "",
     );
     // This log will be written to stdout:
@@ -46,7 +46,7 @@ fn main() {
         status = 200_u16,
         start = unix_ms(),
         elapsed = 10_u64,
-        kv = log::as_serde!(kv);
+        kv:serde = kv;
         "",
     );
     // This log will be written to file "app.log":

examples/simple.rs

@@ -23,7 +23,7 @@ async fn main() {
         status = 200_u16,
         start = unix_ms(),
         elapsed = 10_u64,
-        kv = log::as_serde!(kv);
+        kv:serde = kv;
         "",
     );
     // This log will be written to stdout:

src/async_json.rs

@@ -33,7 +33,7 @@ impl<W: AsyncWrite + Sync + Send + 'static> Writer for AsyncJSONWriter<W> {
         let mut buf = Vec::with_capacity(256);
         serde_json::to_writer(&mut buf, value).map_err(io::Error::from)?;
         // must write the LINE FEED character.
-        buf.write_all(b"\n").map_err(io::Error::from)?;
+        buf.write_all(b"\n")?;
 
         let w = self.0.clone();
         tokio::spawn(async move {

src/json.rs

@@ -30,11 +30,11 @@ impl<W: Write + Sync + Send + 'static> Writer for JSONWriter<W> {
         let mut buf = Vec::with_capacity(256);
         serde_json::to_writer(&mut buf, value).map_err(io::Error::from)?;
         // must write the LINE FEED character.
-        buf.write_all(b"\n").map_err(io::Error::from)?;
+        buf.write_all(b"\n")?;
 
         let w = self.0.lock();
         if let Ok(mut w) = w.try_borrow_mut() {
-            w.as_mut().write_all(&buf).map_err(io::Error::from)?;
+            w.as_mut().write_all(&buf)?;
         } else {
             // should never happen, but if it does, we log it.
             log_failure("JSONWriter failed to write log: writer already borrowed");