Merge branch 'master' into custom-format

.github/actions-rs/grcov.yml

@@ -0,0 +1,3 @@
+ignore-not-existing: true
+ignore:
+  - "../*"

.github/workflows/ci.yml

@@ -0,0 +1,125 @@
+# Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md
+
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        toolchain: [stable, beta, nightly]
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install ${{ matrix.toolchain }} toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.toolchain }}
+          override: true
+
+      - name: Run cargo check
+        uses: actions-rs/cargo@v1
+        with:
+          command: check
+          args: --all-features --all
+
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        toolchain: [stable, beta, nightly]
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install ${{ matrix.toolchain }} toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.toolchain }}
+          override: true
+
+      - name: Run cargo test
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features --all
+
+  lints:
+    name: Lints
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        toolchain: [stable, beta, nightly]
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install ${{ matrix.toolchain }} toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.toolchain }}
+          override: true
+          components: rustfmt, clippy
+
+      - name: Run cargo fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - name: Run cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: --all-features --all -- -D warnings
+
+  grcov:
+    name: Coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+
+      - name: Execute tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all --all-features
+        env:
+          CARGO_INCREMENTAL: 0
+          RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Copt-level=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests -Cpanic=abort"
+          RUSTDOCFLAGS: "-Cpanic=abort"
+
+      - name: Gather coverage data
+        id: coverage
+        uses: actions-rs/[email protected]
+
+      - name: Coveralls upload
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel: true
+          path-to-lcov: ${{ steps.coverage.outputs.report }}
+
+  grcov_finalize:
+    runs-on: ubuntu-latest
+    needs: grcov
+    steps:
+      - name: Coveralls finalization
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          parallel-finished: true

Cargo.toml

@@ -1,33 +1,46 @@
 [package]
 name = "sloggers"
-version = "0.3.2"
+version = "2.1.2"
 authors = ["Takeru Ohta <[email protected]>"]
 description = "This library provides frequently used slog loggers and convenient functions"
 homepage = "https://github.com/sile/sloggers"
 repository = "https://github.com/sile/sloggers"
 readme = "README.md"
 keywords = ["logger"]
 license = "MIT"
+edition = "2018"
 
 [badges]
-travis-ci = {repository = "sile/sloggers"}
-codecov = {repository = "sile/sloggers"}
+coveralls = {repository = "sile/sloggers"}
+
+[features]
+default = ["libflate", "slog-kvfilter"]
+json = ["slog-json"]
 
 [dependencies]
-chrono="0.4"
-libflate = "0.1"
-serde = "1"
-serde_derive = "1"
+chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
+libflate = {version = "2", optional = true}
+serde = {version = "1", features = ["derive"]}
 slog = "2"
 slog-async = "2"
 slog-term = "2"
 slog-scope = "4"
-slog-kvfilter = "~0.7"
-slog-stdlog = "3"
-trackable = "0.2.19"
+slog-kvfilter = {version = "~0.7", optional = true}
+slog-json = {version = "2.3.0", optional = true}
+slog-stdlog = "4"
+trackable = "1"
 regex="1"
 
 [dev-dependencies]
-clap = "2"
-serdeconv = "0.3"
+clap = "4"
+log = "0.4"
+serdeconv = "0.4"
 tempfile = "3"
+
+[target.'cfg(unix)'.dependencies]
+libc = "0.2"
+once_cell = "1"
+
+[target.'cfg(windows)'.dependencies]
+winapi = "~0.3.5"
+windows-acl = "~0.3.0"

README.md

@@ -2,8 +2,8 @@
 
 [![Crates.io: sloggers](https://img.shields.io/crates/v/sloggers.svg)](https://crates.io/crates/sloggers)
 [![Documentation](https://docs.rs/sloggers/badge.svg)](https://docs.rs/sloggers)
-[![Build Status](https://travis-ci.org/sile/sloggers.svg?branch=master)](https://travis-ci.org/sile/sloggers)
-[![Code Coverage](https://codecov.io/gh/sile/sloggers/branch/master/graph/badge.svg)](https://codecov.io/gh/sile/sloggers/branch/master)
+[![Actions Status](https://github.com/sile/sloggers/workflows/CI/badge.svg)](https://github.com/sile/sloggers/actions)
+[![Coverage Status](https://coveralls.io/repos/github/sile/sloggers/badge.svg?branch=master)](https://coveralls.io/github/sile/sloggers?branch=master)
 [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE)
 [![Gitter: slog](https://img.shields.io/gitter/room/slog-rs/slog.svg)](https://gitter.im/slog-rs/slog)
 

examples/hello.rs

@@ -1,19 +1,16 @@
-extern crate clap;
-extern crate serdeconv;
 #[macro_use]
 extern crate slog;
-extern crate sloggers;
 #[macro_use]
 extern crate trackable;
 
-use clap::{App, Arg};
+use clap::{Arg, Command};
 use sloggers::{Build, Config, LoggerConfig};
 
 fn main() {
-    let matches = App::new("hello")
-        .arg(Arg::with_name("CONFIG_FILE").index(1).required(true))
+    let matches = Command::new("hello")
+        .arg(Arg::new("CONFIG_FILE").index(1).required(true))
         .get_matches();
-    let config_file = matches.value_of("CONFIG_FILE").unwrap();
+    let config_file = matches.get_one::<String>("CONFIG_FILE").unwrap();
 
     let config: LoggerConfig = track_try_unwrap!(serdeconv::from_toml_file(config_file));
     let builder = track_try_unwrap!(config.try_to_builder());