Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 128 additions & 79 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ categories = ["config"]
repository = "https://github.com/x52dev/confik"
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.70"
rust-version = "1.81"

[patch.crates-io]
confik = { path = "confik" }
Expand Down
2 changes: 1 addition & 1 deletion confik-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ indoc = "2"
rustversion-msrv = "0.100"
serde = { version = "1", features = ["derive"] }
serde-bool = "0.1"
toml = "0.9"
toml = "1"
trybuild = { version = "1", features = ["diff"] }
11 changes: 5 additions & 6 deletions confik-macros/tests/trybuild/fail-default-parse.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ error[E0277]: the trait bound `usize: From<i32>` is not satisfied
3 | #[confik(default = 1 + 2)]
| ^----
| |
| the trait `From<i32>` is not implemented for `usize`
| the trait `From<i32>` is not implemented for `usize`, which is required by `{integer}: Into<_>`
| this tail expression is of type `i32`
|
= help: the following other types implement trait `From<T>`:
<usize as From<NonZeroUsize>>
<usize as From<bool>>
<usize as From<std::ptr::Alignment>>
<usize as From<u16>>
<usize as From<u8>>
`usize` implements `From<bool>`
`usize` implements `From<std::ptr::Alignment>`
`usize` implements `From<u16>`
`usize` implements `From<u8>`
= note: required for `i32` to implement `Into<usize>`
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
error[E0277]: the trait bound `Foo: From<std::string::String>` is not satisfied
error[E0277]: the trait bound `Foo: TryFrom<std::string::String>` is not satisfied
--> tests/trybuild/fail-try-from-not-implemented.rs:5:17
|
5 | #[derive(Debug, Configuration)]
| ^^^^^^^^^^^^^ the trait `From<std::string::String>` is not implemented for `Foo`
| ^^^^^^^^^^^^^ the trait `From<std::string::String>` is not implemented for `Foo`, which is required by `std::string::String: std::convert::TryInto<_>`
|
= note: required for `std::string::String` to implement `Into<Foo>`
= note: required for `Foo` to implement `TryFrom<std::string::String>`
Expand Down
3 changes: 3 additions & 0 deletions confik/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

- 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).
- Minimum supported Rust version (MSRV) is now 1.81.

## 0.15.1

- Add `confik(crate = ...)` option to `Configuration` macro.
Expand Down
2 changes: 1 addition & 1 deletion confik/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ thiserror = "2"

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

ahash = { version = "0.8", optional = true, features = ["serde"] }
bigdecimal = { version = "0.4", optional = true, features = ["serde"] }
Expand Down
13 changes: 1 addition & 12 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,10 @@ msrv_rustup := "+" + msrv
# Downgrade dev-dependencies necessary to run MSRV checks/tests.
[private]
downgrade-for-msrv toolchain="":
#!/usr/bin/env bash
set -eEuo pipefail
cargo {{ toolchain }} update -p=serde_with --precise=3.12.0 # next ver: 1.74.0
cargo {{ toolchain }} update -p=idna_adapter --precise=1.2.0 # next ver: 1.82.0
cargo {{ toolchain }} update -p=litemap --precise=0.7.3 # next ver: 1.71.1
cargo {{ toolchain }} update -p=zerofrom --precise=0.1.4 # next ver: 1.71.1
cargo {{ toolchain }} update -p=yoke --precise=0.7.4 # next ver: 1.71.1
syn_version=$(cargo metadata --format-version=1 | jq -r '.packages[] | select(.name == "syn") | .version')
cargo {{ toolchain }} update -p=syn@"$syn_version" --precise="2.0.114" # next ver: 1.71.0
cargo {{ toolchain }} update -p=quote --precise=1.0.44 # next ver: 1.71.0
cargo {{ toolchain }} update -p=unicode-ident --precise=1.0.22 # next ver: 1.71.0
cargo {{ toolchain }} update -p=toml --precise=0.9.6 # next ver: 1.76.0

# Test workspace using MSRV
test-msrv: downgrade-for-msrv (test-no-coverage msrv_rustup)
test-msrv: (downgrade-for-msrv msrv_rustup) (test-no-coverage msrv_rustup)

# Test workspace without generating coverage files
[private]
Expand Down
Loading