x52dev · robjtede · Feb 25, 2025 · Feb 23, 2025 · Feb 23, 2025
diff --git a/.cspell.yml b/.cspell.yml
@@ -3,6 +3,7 @@ words:
   - bigdecimal
   - bytesize
   - chrono
+  - clippy
   - codecov
   - confik
   - dataless
@@ -15,11 +16,16 @@ words:
   - indoc
   - ipnetwork
   - msrv
+  - nextest
+  - nixpkgs
+  - powerset
   - rustc
   - rustdoc
+  - rustup
   - rustversion
   - serde
   - struct
+  - taplo
   - tempfile
   - thiserror
   - trybuild

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
 
       - name: workaround MSRV issues
         if: matrix.toolchain.name == 'msrv'
-        run: just downgrade-msrv
+        run: just downgrade-for-msrv
 
       - name: Test
         run: just test-no-coverage
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,7 @@ categories = ["config"]
 repository = "https://github.com/x52dev/confik"
 license = "MIT OR Apache-2.0"
 edition = "2021"
-rust-version = "1.67"
+rust-version = "1.70"
 
 [patch.crates-io]
 confik = { path = "confik" }

diff --git a/confik-macros/tests/trybuild/fail-default-parse.stderr b/confik-macros/tests/trybuild/fail-default-parse.stderr
@@ -5,7 +5,7 @@ error[E0277]: the trait bound `usize: From<i32>` is not satisfied
   |                        ^----
   |                        |
   |                        the trait `From<i32>` is not implemented for `usize`
-  |                        this tail expression is of type `_`
+  |                        this tail expression is of type `i32`
   |
   = help: the following other types implement trait `From<T>`:
             <usize as From<NonZeroUsize>>

diff --git a/confik-macros/tests/trybuild/fail-field-from-unknown-type.stderr b/confik-macros/tests/trybuild/fail-field-from-unknown-type.stderr
@@ -1,26 +1,16 @@
 error[E0412]: cannot find type `A` in this scope
  --> tests/trybuild/fail-field-from-unknown-type.rs:6:21
   |
-5 | struct Config {
-  |              - help: you might be missing a type parameter: `<A>`
 6 |     #[confik(from = A)]
   |                     ^ not found in this scope
+  |
+help: you might be missing a type parameter
+  |
+5 | struct Config<A> {
+  |              +++
 
 error[E0412]: cannot find type `A` in this scope
  --> tests/trybuild/fail-field-from-unknown-type.rs:6:21
   |
 6 |     #[confik(from = A)]
   |                     ^ not found in this scope
-
-error[E0283]: type annotations needed
- --> tests/trybuild/fail-field-from-unknown-type.rs:6:21
-  |
-5 |   struct Config {
-  |          ------ in this derive macro expansion
-6 |       #[confik(from = A)]
-  |  _____________________^
-7 | |     param: String,
-  | |_________^ cannot infer type
-  |
-  = note: cannot satisfy `_: Default`
-  = note: this error originates in the derive macro `::std::default::Default` (in Nightly builds, run with -Z macro-backtrace for more info)
diff --git a/confik/CHANGELOG.md b/confik/CHANGELOG.md
@@ -2,7 +2,9 @@
 
 ## Unreleased
 
+- Update `bytesize` dependency to `2`.
 - Update `ipnetwork` dependency to `0.21`.
+- Minimum supported Rust version (MSRV) is now 1.70.
 
 ## 0.12.0
 

diff --git a/confik/Cargo.toml b/confik/Cargo.toml
@@ -52,7 +52,7 @@ serde_json = { version = "1", optional = true }
 toml = { version = "0.8", optional = true, default-features = false, features = ["parse"] }
 
 bigdecimal = { version = "0.4", optional = true, features = ["serde"] }
-bytesize = { version = "1", optional = true, features = ["serde"] }
+bytesize = { version = "2", optional = true, features = ["serde"] }
 camino = { version = "1", optional = true, features = ["serde1"] }
 chrono = { version = "0.4.39", optional = true, default-features = false, features = ["serde"] }
 ipnetwork = { version = "0.21", optional = true, features = ["serde"] }

diff --git a/confik/src/lib.md b/confik/src/lib.md
@@ -182,7 +182,7 @@ Defaults are specified on a per-field basis.
 This crate provides implementations of [`Configuration`] for a number of `std` types and the following third-party crates. Implementations for third-party crates are feature gated.
 
 - `bigdecimal`: v0.4
-- `bytesize`: v1
+- `bytesize`: v2
 - `camino`: v1
 - `chrono`: v0.4
 - `ipnetwork`: v0.21

diff --git a/confik/src/lib.rs b/confik/src/lib.rs
@@ -107,7 +107,6 @@ where
         // If there was no data then we're missing values
         .ok_or_else(|| Error::MissingValue(MissingValue::default()))??
         .try_build()
-        .map_err(Into::into)
 }
 
 /// The target to be deserialized from multiple sources.

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     flake-parts.url = "github:hercules-ci/flake-parts";
   };
 

diff --git a/justfile b/justfile
@@ -16,12 +16,11 @@ msrv_rustup := "+" + msrv
 
 # Downgrade dev-dependencies necessary to run MSRV checks/tests.
 [private]
-downgrade-msrv:
-    cargo update -p=trybuild --precise=1.0.90
-    cargo update -p=serde_with --precise=3.11.0
+downgrade-for-msrv:
+    # no downgrades currently needed
 
 # Test workspace using MSRV
-test-msrv: downgrade-msrv (test-no-coverage msrv_rustup)
+test-msrv: downgrade-for-msrv (test-no-coverage msrv_rustup)
 
 # Test workspace without generating coverage files
 [private]