diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adce0713b..5557ee55d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -74,7 +74,7 @@ jobs: - uses: ./.github/actions/setup-rust with: components: clippy - toolchain: 1.92.0 # MSRV, Minimally Supported Rust Version. Make sure to update README.md and clippy.toml + toolchain: 1.85.0 # MSRV, Minimally Supported Rust Version. Make sure to update README.md and clippy.toml - name: Run clippy run: cargo clippy --locked --all-targets --all-features --workspace -- -D warnings test: diff --git a/Cargo.lock b/Cargo.lock index c9ceb66f7..a6937f536 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -447,11 +447,11 @@ checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] name = "home" -version = "0.5.12" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.59.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 25f4ca335..0bda11a18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ include = [ "README.md", "assets/*", ] -rust-version = "1.92.0" +rust-version = "1.85.0" [features] default = [] diff --git a/README.md b/README.md index 707cc2a12..8ccb9123c 100644 --- a/README.md +++ b/README.md @@ -321,7 +321,7 @@ $ QEMU_STRACE=1 cross run --target aarch64-unknown-linux-gnu ## Minimum Supported Rust Version (MSRV) -This crate is guaranteed to compile on stable Rust 1.92.0 and up. It *might* +This crate is guaranteed to compile on stable Rust 1.85.0 and up. It *might* compile with older versions but that may change in any new patch release. Some cross-compilation targets require a later Rust version, and using Xargo diff --git a/clippy.toml b/clippy.toml index 91da96a84..94044bfd9 100644 --- a/clippy.toml +++ b/clippy.toml @@ -2,4 +2,3 @@ disallowed-methods = [ { path = "std::path::Path::display", reason = "incorrect handling of non-Unicode paths, use path.to_utf8() or debug (`{path:?}`) instead" }, ] allow-unwrap-in-tests = true -msrv = "1.92.0" diff --git a/deny.toml b/deny.toml index 966073a48..1dd86f894 100644 --- a/deny.toml +++ b/deny.toml @@ -13,6 +13,10 @@ version = 2 [bans] multiple-versions = "deny" deny = [] +skip = [ + # home v0.5.11 + { name = "windows-sys", version = "0.59.0" }, +] skip-tree = [ { name = "supports-color", depth = 1, version = "2.1.0", reason = "owo-colors pulls in two versions of supports-color" }, ] diff --git a/src/docker/remote.rs b/src/docker/remote.rs index 373abfc49..c4f405c3b 100644 --- a/src/docker/remote.rs +++ b/src/docker/remote.rs @@ -40,7 +40,7 @@ pub fn posix_parent(path: &str) -> Option<&str> { Path::new(path).parent()?.to_str() } -impl<'a, 'b, 'c> ContainerDataVolume<'a, 'b, 'c> { +impl ContainerDataVolume<'_, '_, '_> { // NOTE: `reldir` should be a relative POSIX path to the root directory // on windows, this should be something like `mnt/c`. that is, all paths // inside the container should not have the mount prefix. diff --git a/src/extensions.rs b/src/extensions.rs index 5578ccd40..c25587ec9 100644 --- a/src/extensions.rs +++ b/src/extensions.rs @@ -61,7 +61,7 @@ impl CommandExt for Command { ) -> String { // a dummy implementor of display to avoid using unwraps struct C<'c, 'd, F>(&'c Command, &'d mut MessageInfo, F); - impl<'e, 'f, F> std::fmt::Display for C<'e, 'f, F> + impl std::fmt::Display for C<'_, '_, F> where F: for<'a> Fn(&'a str) -> bool, {