Merge rust-bitcoin/rust-secp256k1#693: Bump MSRV to 1.56.1

2d0c7835f1 Tighten the version grep in vendor script (Tobin C. Harding)
a2b78f4022 Bump MSRV to 1.56.1 (Tobin C. Harding)

Pull request description:

  As we have done in other parts of the ecosystem bump the MSRV to Rust `v1.56.1`.

  Done for `secp256k1` and `secp256k1-sys`.

  This was originally in #688 but there are too many things going on so here it is separately.

ACKs for top commit:
  apoelstra:
    ACK 2d0c7835f1

Tree-SHA512: 35ac5632428211b02f5b25780c3a680d8c9a68b238de7299242510091f9243fe2f6718817c865c3420e3afb64b32d52daf2cf372706067204e7de42e188c31c6
This commit is contained in:
Andrew Poelstra 2024-03-28 13:38:10 +00:00
commit ac706178bf
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
9 changed files with 20 additions and 10 deletions

View File

@ -55,7 +55,7 @@ jobs:
run: ./contrib/test.sh run: ./contrib/test.sh
MSRV: MSRV:
name: Test - 1.48.0 toolchain name: Test - 1.56.1 toolchain
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
fail-fast: false fail-fast: false
@ -63,7 +63,7 @@ jobs:
- name: Checkout Crate - name: Checkout Crate
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Checkout Toolchain - name: Checkout Toolchain
uses: dtolnay/rust-toolchain@1.48.0 uses: dtolnay/rust-toolchain@1.56.1
- name: Running test script - name: Running test script
env: env:
DO_FEATURE_MATRIX: true DO_FEATURE_MATRIX: true

View File

@ -1,3 +1,7 @@
# Unreleased
* Bump MSRV to Rust `v1.56.1`
# 0.28.2 - 2024-01-30 # 0.28.2 - 2024-01-30
* Implement `Hash` for `Scalar` [#674](https://github.com/rust-bitcoin/rust-secp256k1/pull/674) * Implement `Hash` for `Scalar` [#674](https://github.com/rust-bitcoin/rust-secp256k1/pull/674)

View File

@ -10,7 +10,8 @@ documentation = "https://docs.rs/secp256k1/"
description = "Rust wrapper library for Pieter Wuille's `libsecp256k1`. Implements ECDSA and BIP 340 signatures for the SECG elliptic curve group secp256k1 and related utilities." description = "Rust wrapper library for Pieter Wuille's `libsecp256k1`. Implements ECDSA and BIP 340 signatures for the SECG elliptic curve group secp256k1 and related utilities."
keywords = [ "crypto", "ECDSA", "secp256k1", "libsecp256k1", "bitcoin" ] keywords = [ "crypto", "ECDSA", "secp256k1", "libsecp256k1", "bitcoin" ]
readme = "README.md" readme = "README.md"
edition = "2018" edition = "2021"
rust-version = "1.56.1"
[package.metadata.docs.rs] [package.metadata.docs.rs]
all-features = true all-features = true

View File

@ -6,7 +6,7 @@
<a href="https://github.com/rust-bitcoin/rust-secp256k1/blob/master/LICENSE"><img alt="CC0 1.0 Universal Licensed" src="https://img.shields.io/badge/license-CC0--1.0-blue.svg"/></a> <a href="https://github.com/rust-bitcoin/rust-secp256k1/blob/master/LICENSE"><img alt="CC0 1.0 Universal Licensed" src="https://img.shields.io/badge/license-CC0--1.0-blue.svg"/></a>
<a href="https://github.com/rust-bitcoin/rust-secp256k1/actions?query=workflow%3AContinuous%20integration"><img alt="CI Status" src="https://github.com/rust-bitcoin/rust-secp256k1/workflows/Continuous%20integration/badge.svg"></a> <a href="https://github.com/rust-bitcoin/rust-secp256k1/actions?query=workflow%3AContinuous%20integration"><img alt="CI Status" src="https://github.com/rust-bitcoin/rust-secp256k1/workflows/Continuous%20integration/badge.svg"></a>
<a href="https://docs.rs/secp256k1"><img alt="API Docs" src="https://img.shields.io/badge/docs.rs-secp256k1-green"/></a> <a href="https://docs.rs/secp256k1"><img alt="API Docs" src="https://img.shields.io/badge/docs.rs-secp256k1-green"/></a>
<a href="https://blog.rust-lang.org/2020/02/27/Rust-1.48.0.html"><img alt="Rustc Version 1.48.0+" src="https://img.shields.io/badge/rustc-1.48.0%2B-lightgrey.svg"/></a> <a href="https://blog.rust-lang.org/2020/02/27/Rust-1.56.1.html"><img alt="Rustc Version 1.56.1+" src="https://img.shields.io/badge/rustc-1.56.1.0%2B-lightgrey.svg"/></a>
</p> </p>
</div> </div>
@ -29,7 +29,7 @@ Contributions to this library are welcome. A few guidelines:
* Any breaking changes must have an accompanied entry in CHANGELOG.md * Any breaking changes must have an accompanied entry in CHANGELOG.md
* No new dependencies, please. * No new dependencies, please.
* No crypto should be implemented in Rust, with the possible exception of hash functions. Cryptographic contributions should be directed upstream to libsecp256k1. * No crypto should be implemented in Rust, with the possible exception of hash functions. Cryptographic contributions should be directed upstream to libsecp256k1.
* This library should always compile with any combination of features on **Rust 1.48.0**. * This library should always compile with any combination of features on **Rust 1.56.1**.
### Githooks ### Githooks

View File

@ -1 +1 @@
msrv = "1.48.0" msrv = "1.56.1"

View File

@ -1,3 +1,7 @@
# Unreleased
* Bump MSRV to Rust `v1.56.1`
# 0.9.2 - 2023-12-18 # 0.9.2 - 2023-12-18
* Fix incorrect FFI binding for `secp256k1_pubkey_combine` * Fix incorrect FFI binding for `secp256k1_pubkey_combine`

View File

@ -13,7 +13,8 @@ keywords = [ "secp256k1", "libsecp256k1", "ffi" ]
readme = "README.md" readme = "README.md"
build = "build.rs" build = "build.rs"
links = "rustsecp256k1_v0_9_2" links = "rustsecp256k1_v0_9_2"
edition = "2018" edition = "2021"
rust-version = "1.56.1"
[package.metadata.docs.rs] [package.metadata.docs.rs]
all-features = true all-features = true

View File

@ -5,7 +5,7 @@
<a href="https://crates.io/crates/secp256k1-sys"><img alt="Crate Info" src="https://img.shields.io/crates/v/secp256k1-sys.svg"/></a> <a href="https://crates.io/crates/secp256k1-sys"><img alt="Crate Info" src="https://img.shields.io/crates/v/secp256k1-sys.svg"/></a>
<a href="https://github.com/rust-bitcoin/rust-secp256k1/blob/master/LICENSE"><img alt="CC0 1.0 Universal Licensed" src="https://img.shields.io/badge/license-CC0--1.0-blue.svg"/></a> <a href="https://github.com/rust-bitcoin/rust-secp256k1/blob/master/LICENSE"><img alt="CC0 1.0 Universal Licensed" src="https://img.shields.io/badge/license-CC0--1.0-blue.svg"/></a>
<a href="https://docs.rs/secp256k1"><img alt="API Docs" src="https://img.shields.io/badge/docs.rs-secp256k1-green"/></a> <a href="https://docs.rs/secp256k1"><img alt="API Docs" src="https://img.shields.io/badge/docs.rs-secp256k1-green"/></a>
<a href="https://blog.rust-lang.org/2020/02/27/Rust-1.48.0.html"><img alt="Rustc Version 1.48.0+" src="https://img.shields.io/badge/rustc-1.48.0%2B-lightgrey.svg"/></a> <a href="https://blog.rust-lang.org/2020/02/27/Rust-1.56.1.html"><img alt="Rustc Version 1.56.1+" src="https://img.shields.io/badge/rustc-1.56.1%2B-lightgrey.svg"/></a>
</p> </p>
</div> </div>
@ -49,4 +49,4 @@ to your `RUSTFLAGS` variable.
## Minimum Supported Rust Version ## Minimum Supported Rust Version
This library should always compile with any combination of features on **Rust 1.48.0**. This library should always compile with any combination of features on **Rust 1.56.1**.

View File

@ -8,7 +8,7 @@ else
SECP_VENDOR_GIT_ROOT="$(realpath "$SECP_VENDOR_GIT_ROOT")" SECP_VENDOR_GIT_ROOT="$(realpath "$SECP_VENDOR_GIT_ROOT")"
fi fi
SECP_SYS="$SECP_VENDOR_GIT_ROOT"/secp256k1-sys SECP_SYS="$SECP_VENDOR_GIT_ROOT"/secp256k1-sys
DEFAULT_VERSION_CODE=$(grep version "$SECP_SYS/Cargo.toml" | sed 's/\./_/g' | sed 's/.*"\(.*\)".*/\1/') DEFAULT_VERSION_CODE=$(grep "^version" "$SECP_SYS/Cargo.toml" | sed 's/\./_/g' | sed 's/.*"\(.*\)".*/\1/')
DEFAULT_DEPEND_DIR="$SECP_SYS/depend" DEFAULT_DEPEND_DIR="$SECP_SYS/depend"
DEFAULT_SECP_REPO=https://github.com/bitcoin-core/secp256k1.git DEFAULT_SECP_REPO=https://github.com/bitcoin-core/secp256k1.git