From e11da6a8e6090e6aed1a80dcb981436af566f6ae Mon Sep 17 00:00:00 2001
From: Daniel Bloom <7810950-Daniel.Aaron.Bloom@users.noreply.gitlab.com>
Date: Thu, 29 Dec 2022 10:11:08 -0800
Subject: [PATCH] refactor: bump MSRV to `1.60.0` to unify features

---
 .github/workflows/ci.yml | 8 ++++----
 CHANGELOG.md             | 2 ++
 Cargo.toml               | 5 +----
 README.md                | 2 +-
 rust-toolchain           | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 26b2385..7261d5c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
 
       # Ensure all code has been formatted with rustfmt
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
       - name: cargo fetch
         uses: actions-rs/cargo@v1
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
       - run: rustup target add thumbv6m-none-eabi
       - name: cargo fetch
@@ -84,7 +84,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.60.0
           override: true
       - name: cargo fetch
         uses: actions-rs/cargo@v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9188fcf..7eb72b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this library adheres to Rust's notion of
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- MSRV is now 1.60.0.
+- Removed `derive_bits` feature. Users should enable `derive` and `bits` instead.
 
 ## [0.13.0] - 2022-12-06
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index 95ee2b9..19ee09d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,12 +27,9 @@ rand = "0.8"
 [features]
 default = ["bits", "std"]
 alloc = []
-bits = ["bitvec"]
+bits = ["bitvec", "ff_derive?/bits"]
 derive = ["byteorder", "ff_derive"]
 std = ["alloc"]
-# with MSRV 1.60 this could be merged into bits with ff_derive?/bits
-# see PR#72 for more information.
-derive_bits = ["bits", "ff_derive/bits"]
 
 [[test]]
 name = "derive"
diff --git a/README.md b/README.md
index e725e83..0996f99 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ And that's it! `Fp` now implements `Field` and `PrimeField`.
 
 ## Minimum Supported Rust Version
 
-Requires Rust **1.56** or higher.
+Requires Rust **1.60** or higher.
 
 Minimum supported Rust version can be changed in the future, but it will be done with a
 minor version bump.
diff --git a/rust-toolchain b/rust-toolchain
index 3ebf789..4d5fde5 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.56.0
+1.60.0