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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ jobs:

# Pin to the declared MSRV (rust-version in [workspace.package]). If this
# job fails, either fix the offending code or bump rust-version in lockstep.
- name: Install MSRV toolchain (1.85)
uses: dtolnay/rust-toolchain@1.85
- name: Install MSRV toolchain (1.95)
uses: dtolnay/rust-toolchain@1.95

- name: Cache cargo registry and target
uses: actions/cache@v5
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ The 1.0 release is being assembled across a series of PRs tracked in

## [Unreleased]

### Changed

- Minimum Supported Rust Version (MSRV) raised from 1.85 to **1.95**. Direct and
transitive dependencies (e.g. `sysinfo` 0.39, `testcontainers` 0.27, `etcetera`)
now require a newer rustc than 1.85, and the MSRV-aware resolver could no longer
keep `Cargo.lock` compatible with 1.85 without impractical downgrades. The CI
`MSRV (cargo check)` job now pins `dtolnay/rust-toolchain@1.95`, and `Cargo.lock`
was regenerated. Restores the green MSRV gate (was failing on `main`). Also
allows the `clippy::collapsible_if` lint workspace-wide, which clippy 1.95
newly raises on `if cond { if let .. {} }` (suggesting let-chains); the nested
form is kept for readability rather than churning ~60 call sites.

### Removed

- Removed out-of-scope feature-authoring (OCI publish/upload) code from
Expand Down
56 changes: 28 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ documentation = "https://github.com/get2knowio/deacon"
keywords = ["devcontainer", "containers", "docker", "development", "cli"]
categories = ["command-line-utilities", "development-tools"]
# Minimum Supported Rust Version. Verified in CI by a dedicated job pinned to
# this exact toolchain. edition 2024 requires >= 1.85.
rust-version = "1.85"
# this exact toolchain. edition 2024 requires >= 1.85; raised to 1.95 because
# direct/transitive dependencies (e.g. sysinfo 0.39, testcontainers 0.27) now
# require a newer rustc than 1.85, and pinning them down is no longer practical.
rust-version = "1.95"

[workspace.dependencies]
# Pin a version alongside the path so cargo-deny does not flag it as a wildcard dep.
Expand Down Expand Up @@ -61,6 +63,14 @@ temp-env = { version = "0.3.6", features = ["async_closure"] }
# still turns any unguarded `unsafe` into a compile error.
unsafe_code = "deny"

[workspace.lints.clippy]
# clippy 1.95 expanded `collapsible_if` to also flag `if cond { if let .. {} }`
# and suggest collapsing into a let-chain (`if cond && let .. {}`). The codebase
# deliberately keeps the nested form in many places for readability; adopting
# let-chains everywhere is a large, churny rewrite out of scope for the MSRV
# bump. Allow the lint so `cargo clippy -D warnings` stays green on 1.95.
collapsible_if = "allow"

[profile.dev]
# Lighter debug info than the default (2) for faster incremental links. Was
# previously a global `-C debuginfo=1` rustflag in .cargo/config.toml, which
Expand Down
Loading