Skip to content

Commit 58f7468

Browse files
committed
Drop MSRV to 1.65 and bump toml, mock_instant
1 parent 1a758c1 commit 58f7468

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
rust_versions: ["stable", "1.69"]
20+
rust_versions: ["stable", "1.65"]
2121
os: [ubuntu-latest, windows-latest]
2222
steps:
2323
- name: Checkout the source code
@@ -63,7 +63,7 @@ jobs:
6363
runs-on: ubuntu-latest
6464
strategy:
6565
matrix:
66-
rust_versions: ["stable", "1.69"]
66+
rust_versions: ["stable", "1.65"]
6767
steps:
6868
- name: Checkout the source code
6969
uses: actions/checkout@v4

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/estk/log4rs"
88
readme = "README.md"
99
keywords = ["log", "logger", "logging", "log4"]
1010
edition = "2018"
11-
rust-version = "1.69"
11+
rust-version = "1.65"
1212

1313
[features]
1414
default = ["all_components", "config_parsing", "yaml_format"]
@@ -70,7 +70,7 @@ thread-id = { version = "4", optional = true }
7070
typemap-ors = { version = "1.0.0", optional = true }
7171
serde_json = { version = "1.0", optional = true }
7272
serde_yaml = { version = "0.9", optional = true }
73-
toml = { version = "<0.8.10", optional = true }
73+
toml = { version = "0.8.14", optional = true }
7474
parking_lot = { version = "0.12.0", optional = true }
7575
rand = { version = "0.8", optional = true}
7676
thiserror = "1.0.15"
@@ -89,7 +89,7 @@ lazy_static = "1.4"
8989
streaming-stats = "0.2.3"
9090
humantime = "2.1"
9191
tempfile = "3.8"
92-
mock_instant = "0.3"
92+
mock_instant = "0.5"
9393
serde_test = "1.0.176"
9494

9595
[[example]]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
[![crates.io](https://img.shields.io/crates/v/log4rs.svg)](https://crates.io/crates/log4rs)
55
[![License: MIT OR Apache-2.0](https://img.shields.io/crates/l/clippy.svg)](#license)
66
![CI](https://github.com/estk/log4rs/workflows/CI/badge.svg)
7-
[![Minimum rustc version](https://img.shields.io/badge/rustc-1.69+-green.svg)](https://github.com/estk/log4rs#rust-version-requirements)
7+
[![Minimum rustc version](https://img.shields.io/badge/rustc-1.65+-green.svg)](https://github.com/estk/log4rs#rust-version-requirements)
88

99
log4rs is a highly configurable logging framework modeled after Java's Logback
1010
and log4j libraries.
@@ -54,7 +54,7 @@ fn main() {
5454

5555
## Rust Version Requirements
5656

57-
1.69
57+
1.65
5858

5959
## Building for Dev
6060

src/append/rolling_file/policy/compound/trigger/time.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use chrono::NaiveDateTime;
77
use chrono::{DateTime, Datelike, Duration, Local, TimeZone, Timelike};
88
#[cfg(test)]
9-
use mock_instant::{SystemTime, UNIX_EPOCH};
9+
use mock_instant::global::{SystemTime, UNIX_EPOCH};
1010
use rand::Rng;
1111
#[cfg(feature = "config_parsing")]
1212
use serde::de;
@@ -340,7 +340,7 @@ impl Deserialize for TimeTriggerDeserializer {
340340
#[cfg(test)]
341341
mod test {
342342
use super::*;
343-
use mock_instant::MockClock;
343+
use mock_instant::global::MockClock;
344344
use std::time::Duration;
345345

346346
fn trigger_with_time_and_modulate(

0 commit comments

Comments
 (0)