Skip to content

Commit 25cfa65

Browse files
build(deps): bump toml from 0.9.6 to 1.0.3+spec-1.1.0 (#360)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Ede <robjtede@icloud.com>
1 parent 3daa95b commit 25cfa65

File tree

8 files changed

+142
-102
lines changed

8 files changed

+142
-102
lines changed

Cargo.lock

Lines changed: 128 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ categories = ["config"]
99
repository = "https://github.com/x52dev/confik"
1010
license = "MIT OR Apache-2.0"
1111
edition = "2021"
12-
rust-version = "1.70"
12+
rust-version = "1.81"
1313

1414
[patch.crates-io]
1515
confik = { path = "confik" }

confik-macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ indoc = "2"
2626
rustversion-msrv = "0.100"
2727
serde = { version = "1", features = ["derive"] }
2828
serde-bool = "0.1"
29-
toml = "0.9"
29+
toml = "1"
3030
trybuild = { version = "1", features = ["diff"] }

confik-macros/tests/trybuild/fail-default-parse.stderr

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ error[E0277]: the trait bound `usize: From<i32>` is not satisfied
44
3 | #[confik(default = 1 + 2)]
55
| ^----
66
| |
7-
| the trait `From<i32>` is not implemented for `usize`
7+
| the trait `From<i32>` is not implemented for `usize`, which is required by `{integer}: Into<_>`
88
| this tail expression is of type `i32`
99
|
1010
= help: the following other types implement trait `From<T>`:
11-
<usize as From<NonZeroUsize>>
12-
<usize as From<bool>>
13-
<usize as From<std::ptr::Alignment>>
14-
<usize as From<u16>>
15-
<usize as From<u8>>
11+
`usize` implements `From<bool>`
12+
`usize` implements `From<std::ptr::Alignment>`
13+
`usize` implements `From<u16>`
14+
`usize` implements `From<u8>`
1615
= note: required for `i32` to implement `Into<usize>`

confik-macros/tests/trybuild/fail-try-from-not-implemented.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error[E0277]: the trait bound `Foo: From<std::string::String>` is not satisfied
1+
error[E0277]: the trait bound `Foo: TryFrom<std::string::String>` is not satisfied
22
--> tests/trybuild/fail-try-from-not-implemented.rs:5:17
33
|
44
5 | #[derive(Debug, Configuration)]
5-
| ^^^^^^^^^^^^^ the trait `From<std::string::String>` is not implemented for `Foo`
5+
| ^^^^^^^^^^^^^ the trait `From<std::string::String>` is not implemented for `Foo`, which is required by `std::string::String: std::convert::TryInto<_>`
66
|
77
= note: required for `std::string::String` to implement `Into<Foo>`
88
= note: required for `Foo` to implement `TryFrom<std::string::String>`

confik/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Unreleased
44

5+
- Update `toml` dependency to `1`. This means config files now support the TOML v1.1 spec with [some new features](https://github.com/toml-lang/toml/releases/tag/1.1.0).
6+
- Minimum supported Rust version (MSRV) is now 1.81.
7+
58
## 0.15.1
69

710
- Add `confik(crate = ...)` option to `Configuration` macro.

confik/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ thiserror = "2"
5151

5252
envious = { version = "0.2", optional = true }
5353
serde_json = { version = "1", optional = true }
54-
toml = { version = "0.9", optional = true, default-features = false, features = ["parse", "serde"] }
54+
toml = { version = "1", optional = true, default-features = false, features = ["parse", "serde"] }
5555

5656
ahash = { version = "0.8", optional = true, features = ["serde"] }
5757
bigdecimal = { version = "0.4", optional = true, features = ["serde"] }

justfile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,10 @@ msrv_rustup := "+" + msrv
1717
# Downgrade dev-dependencies necessary to run MSRV checks/tests.
1818
[private]
1919
downgrade-for-msrv toolchain="":
20-
#!/usr/bin/env bash
21-
set -eEuo pipefail
22-
cargo {{ toolchain }} update -p=serde_with --precise=3.12.0 # next ver: 1.74.0
2320
cargo {{ toolchain }} update -p=idna_adapter --precise=1.2.0 # next ver: 1.82.0
24-
cargo {{ toolchain }} update -p=litemap --precise=0.7.3 # next ver: 1.71.1
25-
cargo {{ toolchain }} update -p=zerofrom --precise=0.1.4 # next ver: 1.71.1
26-
cargo {{ toolchain }} update -p=yoke --precise=0.7.4 # next ver: 1.71.1
27-
syn_version=$(cargo metadata --format-version=1 | jq -r '.packages[] | select(.name == "syn") | .version')
28-
cargo {{ toolchain }} update -p=syn@"$syn_version" --precise="2.0.114" # next ver: 1.71.0
29-
cargo {{ toolchain }} update -p=quote --precise=1.0.44 # next ver: 1.71.0
30-
cargo {{ toolchain }} update -p=unicode-ident --precise=1.0.22 # next ver: 1.71.0
31-
cargo {{ toolchain }} update -p=toml --precise=0.9.6 # next ver: 1.76.0
3221

3322
# Test workspace using MSRV
34-
test-msrv: downgrade-for-msrv (test-no-coverage msrv_rustup)
23+
test-msrv: (downgrade-for-msrv msrv_rustup) (test-no-coverage msrv_rustup)
3524

3625
# Test workspace without generating coverage files
3726
[private]

0 commit comments

Comments
 (0)