From e2d23f5cb8f6544221a81a16ebb43046e3b36109 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Sat, 8 Jul 2023 10:57:02 -0700 Subject: [PATCH] Revert to MSRV 1.52 for read-only --- .github/workflows/rust.yml | 4 ++-- Cargo.toml | 4 ++-- README.md | 2 +- clippy.toml | 2 +- crates/msrv-read/Cargo.toml | 15 +++++++++++++++ crates/msrv-read/src/main.rs | 1 + 6 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 crates/msrv-read/Cargo.toml create mode 100644 crates/msrv-read/src/main.rs diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4e109214..6fab39f2 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -75,9 +75,9 @@ jobs: with: submodules: true - name: Install rust - run: rustup update 1.60.0 && rustup default 1.60.0 + run: rustup update 1.52.0 && rustup default 1.52.0 - name: Test - run: cargo test --verbose --no-default-features --features read,std + run: cargo test --verbose --manifest-path crates/msrv-read/Cargo.toml --package object msrv-all: runs-on: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index e37f086e..355b6ee5 100755 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,9 +35,9 @@ read_core = [] # Read support for most file formats (including unaligned files). read = ["read_core", "archive", "coff", "elf", "macho", "pe", "xcoff", "unaligned"] # Core write support. You will need to enable some file formats too. -write_core = ["crc32fast", "dep:indexmap", "dep:hashbrown"] +write_core = ["crc32fast", "indexmap", "hashbrown"] # Core write support with libstd features. You will need to enable some file formats too. -write_std = ["write_core", "std", "indexmap?/std", "crc32fast/std"] +write_std = ["write_core", "std", "indexmap/std", "crc32fast/std"] # Write support for all file formats, including libstd features. write = ["write_std", "coff", "elf", "macho", "pe", "xcoff"] diff --git a/README.md b/README.md index 1e6f36af..a02e49d0 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ See [`crates/examples`](crates/examples) for more examples. 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.52.0 for the `read` feature and its dependencies. * 1.64.0 for the `write` feature and its dependencies. ## License diff --git a/clippy.toml b/clippy.toml index 16caf02e..935336a4 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.60.0" +msrv = "1.52.0" diff --git a/crates/msrv-read/Cargo.toml b/crates/msrv-read/Cargo.toml new file mode 100644 index 00000000..3e0fe66d --- /dev/null +++ b/crates/msrv-read/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "msrv-read" +version = "0.1.0" +edition = "2018" +publish = false + +[dependencies.object] +path = "../.." +default-features = false +features = ["read", "std"] + +# Do not act as part of the root workspace, so we can +# resolve the dependency tree without hashbrown, which +# requires 1.60 for its dep syntax and 1.64 to build. +[workspace] diff --git a/crates/msrv-read/src/main.rs b/crates/msrv-read/src/main.rs new file mode 100644 index 00000000..f328e4d9 --- /dev/null +++ b/crates/msrv-read/src/main.rs @@ -0,0 +1 @@ +fn main() {}