Skip to content

Commit 7a432d9

Browse files
authored
Merge pull request #718 from rust-lang/ci/msrv
Fix up CI
2 parents c540184 + 0689d56 commit 7a432d9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
runs-on: ubuntu-latest
9999
steps:
100100
- uses: actions/checkout@v4
101-
- uses: dtolnay/rust-toolchain@1.61.0
101+
- uses: dtolnay/rust-toolchain@1.68.0
102102
with:
103103
components: clippy
104104
- uses: taiki-e/install-action@cargo-hack

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ A lightweight logging facade for Rust
1313
categories = ["development-tools::debugging"]
1414
keywords = ["logging"]
1515
exclude = ["rfcs/**/*"]
16-
rust-version = "1.61.0"
16+
rust-version = "1.68.0"
1717
edition = "2021"
1818

1919
[package.metadata.docs.rs]
@@ -39,7 +39,7 @@ std = []
3939
kv = []
4040
kv_sval = ["kv", "value-bag/sval", "sval", "sval_ref"]
4141
kv_std = ["std", "kv", "value-bag/error"]
42-
kv_serde = ["kv_std", "value-bag/serde", "serde_core"]
42+
kv_serde = ["kv_std", "value-bag/serde", "serde"]
4343

4444
# This is here to not break backwards compatibility with the implicit feature
4545
# that enables support for serde based on the dependency name. Since we're now
@@ -55,17 +55,17 @@ kv_unstable_serde = ["kv_serde", "kv_unstable_std"]
5555

5656
[dependencies]
5757
serde_core = { version = "1.0", optional = true, default-features = false }
58-
sval = { version = "2.14.1", optional = true, default-features = false }
59-
sval_ref = { version = "2.1", optional = true, default-features = false }
60-
value-bag = { version = "1.7", optional = true, default-features = false, features = ["inline-i128"] }
58+
sval = { version = "2.16", optional = true, default-features = false }
59+
sval_ref = { version = "2.16", optional = true, default-features = false }
60+
value-bag = { version = "1.12", optional = true, default-features = false, features = ["inline-i128"] }
6161

6262
[dev-dependencies]
6363
serde = { version = "1.0", features = ["derive"] }
6464
serde_json = { version = "1.0" }
6565
serde_test = { version = "1.0" }
66-
sval = { version = "2.1" }
67-
sval_derive = { version = "2.1" }
68-
value-bag = { version = "1.7", features = ["test"] }
66+
sval = { version = "2.16" }
67+
sval_derive = { version = "2.16" }
68+
value-bag = { version = "1.12", features = ["test"] }
6969

7070
# NOTE: log doesn't actually depend on this crate. However, our dependencies,
7171
# serde and sval, dependent on version 1.0 of the crate, which has problem fixed

src/kv/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
//!
192192
//! ```
193193
//! # fn main() -> Result<(), Box<dyn std::error::Error>> {
194-
//! # #[cfg(feature = "serde")]
194+
//! # #[cfg(feature = "kv_serde")]
195195
//! # {
196196
//! # use log::kv::Key;
197197
//! #[derive(serde::Serialize)]

0 commit comments

Comments
 (0)