Merge branch 'estk:main' into onstartup

Dirreke · Feb 10, 2024 · ce94d89 · ce94d89
2 parents 31524e3 + c981ca4
commit ce94d89
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust_versions: ["stable", "1.67"]
+        rust_versions: ["stable", "1.69"]
         os: [ubuntu-latest, windows-latest]
     steps:
     - name: Checkout the source code
@@ -63,7 +63,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rust_versions: ["stable", "1.67"]
+        rust_versions: ["stable", "1.69"]
     steps:
     - name: Checkout the source code
       uses: actions/checkout@v4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,39 @@
 # Change Log
 
+## [1.3.0]
+
+### New
+
+* Add debug and release formatters
+* Documentation on configuring the tool
+* Code Coverage CI
+* CVE Audit CI
+* EditorConfig CI
+* Code Owners
+* NO_COLOR, CLICOLOR, CLICOLOR_FORCE controls
+* Example of inline configuration with file rotation
+* Time Based Trigger
+
+### Changed
+
+* Update minimum supported rust to 1.69 for CVE-2020-26235
+* Update `arc-swap` to `1.6`
+* Update `log` to `0.4.20`
+* Update `humantime` to `2.1`
+* Update `serde_yaml` to `0.9`
+* Update `toml` to `0.8`
+* Update `derivative` to `2.2`
+* Update `tempfile` to `3.8`
+* Moved `level` field before `message` in json format
+* Legacy test moved to examples
+
+
+### Fixed
+
+* README typo regarding building for dev on windows
+* Apply editorconfig
+* Swap rustfmt configuration to `imports_granularity="Crate"` over deprecated `merge_imports = true`
+
 ## [1.2.0]
 
 ### Changed

diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/estk/log4rs"
 readme = "README.md"
 keywords = ["log", "logger", "logging", "log4"]
 edition = "2018"
-rust-version = "1.67"
+rust-version = "1.69"
 
 [features]
 default = ["all_components", "config_parsing", "yaml_format"]
@@ -58,7 +58,7 @@ harness = false
 
 [dependencies]
 arc-swap = "1.6"
-chrono = { version = "0.4", optional = true, features = ["clock"], default-features = false }
+chrono = { version = "0.4.23", optional = true, features = ["clock"], default-features = false }
 flate2 = { version = "1.0", optional = true }
 fnv = "1.0"
 humantime = { version = "2.1", optional = true }

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![crates.io](https://img.shields.io/crates/v/log4rs.svg)](https://crates.io/crates/log4rs)
 [![License: MIT OR Apache-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
 ![CI](https://github.com/estk/log4rs/workflows/CI/badge.svg)
-[![Minimum rustc version](https://img.shields.io/badge/rustc-1.67+-green.svg)](https://github.com/estk/log4rs#rust-version-requirements)
+[![Minimum rustc version](https://img.shields.io/badge/rustc-1.69+-green.svg)](https://github.com/estk/log4rs#rust-version-requirements)
 
 log4rs is a highly configurable logging framework modeled after Java's Logback
 and log4j libraries.
@@ -71,7 +71,7 @@ fn main() {
 
 ## Rust Version Requirements
 
-1.67
+1.69
 
 ## Building for Dev
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -464,10 +464,6 @@ impl Handle {
     }
 }
 
-trait ErrorInternals {
-    fn new(message: String) -> Self;
-}
-
 #[cfg(test)]
 mod test {
     use log::{Level, LevelFilter, Log};