From f6047c365a2272ba9cf785d698b1f8e984b7f3d5 Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Wed, 27 Mar 2024 23:19:08 -0400 Subject: [PATCH] Update MSRV to 1.65. --- .github/workflows/rust.yml | 1 - Cargo.toml | 2 +- README.md | 5 +---- clippy.toml | 2 +- xtask/src/main.rs | 18 ------------------ 5 files changed, 3 insertions(+), 25 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 546ea035..c8525eb0 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -56,7 +56,6 @@ jobs: - uses: actions/checkout@v4 with: submodules: true - - uses: dtolnay/rust-toolchain@1.60.0 - uses: dtolnay/rust-toolchain@1.65.0 - run: cargo xtask msrv diff --git a/Cargo.toml b/Cargo.toml index ef7a1596..5a2bbdf3 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" keywords = ["object", "elf", "mach-o", "pe", "coff"] license = "Apache-2.0 OR MIT" repository = "https://github.com/gimli-rs/object" -rust-version = "1.60" +rust-version = "1.65" description = "A unified interface for reading and writing object file formats." include = [ "/Cargo.toml", diff --git a/README.md b/README.md index 08d9c803..c466f190 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,7 @@ See [`crates/examples`](crates/examples) for more examples. ## Minimum Supported Rust Version (MSRV) Changes to MSRV are considered breaking changes. We are conservative about changing the MSRV, -but sometimes are required to due to dependencies. The MSRV is: - - * 1.60.0 for the `read` feature and its dependencies. - * 1.65.0 for other features. +but sometimes are required to due to dependencies. The MSRV is 1.65.0. ## License diff --git a/clippy.toml b/clippy.toml index 16caf02e..e034672c 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.60.0" +msrv = "1.65.0" diff --git a/xtask/src/main.rs b/xtask/src/main.rs index a5a4850c..842ed481 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -185,24 +185,6 @@ fn cmd_cross() -> Result<(), DynError> { } fn cmd_msrv() -> Result<(), DynError> { - // Test MSRV for object read feature. - cargo(&["update", "-p", "memchr", "--precise", "2.6.2"])?; - cmd_with( - "cargo", - &[ - "+1.60.0", - "test", - "-p", - "object", - "--no-default-features", - "--features", - "read,std", - ], - |cmd| { - cmd.env("CARGO_NET_GIT_FETCH_WITH_CLI", "true"); - }, - )?; - cargo(&["update", "-p", "memchr"])?; // Test MSRV for object all features. cargo(&["update", "-p", "ahash", "--precise", "0.8.6"])?; cmd_with(