Bump MSRV to 1.63.0

Because in 1.63.0 this was fixed: rust-lang/rust#83701
nickfarrow · Feb 17, 2024 · 3435eae · 3435eae
1 parent aede900
commit 3435eae
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@1.60.0
+      - uses: dtolnay/rust-toolchain@1.63.0
       - uses: Swatinem/rust-cache@v2
       - run: |
           cargo update -p proptest --precise "1.2.0"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 
 ## Unreleased
 
+- Bumped MSRV to 1.63.0 to reduce friction
+- Added `share_backup` module in `schnorr_fun`
 - Added `arithmetic_macros` to make `g!` and `s!` macros into procedural macros
 - Made even `Secret` things `Copy`. See discussion [here](https://github.com/LLFourn/secp256kfun/issues/6#issuecomment-1363752651).
 

diff --git a/ecdsa_fun/Cargo.toml b/ecdsa_fun/Cargo.toml
@@ -3,7 +3,7 @@ name = "ecdsa_fun"
 version = "0.9.0"
 authors = ["LLFourn <lloyd.fourn@gmail.com>"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.63"
 license = "0BSD"
 homepage = "https://github.com/LLFourn/secp256kfun/tree/master/ecdsa_fun"
 repository = "https://github.com/LLFourn/secp256kfun"

diff --git a/schnorr_fun/Cargo.toml b/schnorr_fun/Cargo.toml
@@ -4,7 +4,7 @@ name = "schnorr_fun"
 version = "0.9.1"
 authors = ["LLFourn <lloyd.fourn@gmail.com>"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.63"
 license = "0BSD"
 homepage = "https://github.com/LLFourn/secp256kfun/tree/master/schnorr_fun"
 repository = "https://github.com/LLFourn/secp256kfun"
@@ -15,6 +15,7 @@ keywords = ["bitcoin", "schnorr"]
 
 [dependencies]
 secp256kfun = { path = "../secp256kfun", version = "0.9",  default-features = false }
+bech32 = { version = "0.9", optional = true, default-features = false }
 
 [dev-dependencies]
 secp256kfun = { path = "../secp256kfun", version = "0.9",  features = ["proptest"] }
@@ -44,12 +45,7 @@ serde = ["secp256kfun/serde"]
 libsecp_compat = ["secp256kfun/libsecp_compat", "libsecp_compat_0_27"]
 libsecp_compat_0_27 = ["secp256kfun/libsecp_compat_0_27"]
 proptest = ["secp256kfun/proptest"]
-share_backup = ["bech32"]
-
-[dependencies.bech32]
-version = "0.9"
-optional = true
-default-features = false
+share_backup = ["dep:bech32"]
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/schnorr_fun/src/share_backup.rs b/schnorr_fun/src/share_backup.rs
@@ -50,12 +50,11 @@
 use alloc::{fmt, string::String, vec::Vec};
 use bech32::{u5, FromBase32, ToBase32, Variant::Bech32m};
 use core::{num::NonZeroU32, str::FromStr};
-use secp256kfun::marker::ZeroChoice;
 use secp256kfun::{
     digest::{generic_array::typenum::U32, Digest},
     g,
     hash::HashAdd,
-    marker::{Normal, Public},
+    marker::*,
     poly, Point, Scalar, G,
 };
 

diff --git a/secp256kfun/Cargo.toml b/secp256kfun/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/LLFourn/secp256kfun"
 documentation = "https://docs.rs/secp256kfun"
 description = "A mid-level secp256k1 library optimized for fun!"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.63"
 categories = ["cryptography", "cryptography::cryptocurrencies"]
 readme = "README.md"
 keywords = ["bitcoin", "secp256k1"]

diff --git a/secp256kfun/README.md b/secp256kfun/README.md
@@ -175,7 +175,7 @@ assert_eq!(commitment, pedersen_commit(A, &B, &r, &x));
 
 ## MSRV
 
-Minimum supported rust version is `v1.60`. Technically `rustc` only needs to be `v1.56` but we need features from `v.1.60` of cargo.
+Minimum supported rust version is `v1.63`. 
 
 ## LICENSE
 

diff --git a/sigma_fun/Cargo.toml b/sigma_fun/Cargo.toml
@@ -3,7 +3,7 @@ name = "sigma_fun"
 version = "0.6.0"
 authors = ["LLFourn <lloyd.fourn@gmail.com>"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.63"
 license = "0BSD"
 description = "A framework for making Sigma protocols fun!"
 homepage = "https://github.com/LLFourn/secp256kfun/tree/master/sigma_fun"
-Original file line number
+Diff line change
@@ Expand Up / @@ -175,7 +175,7 @@ assert_eq!(commitment, pedersen_commit(A, &B, &r, &x)); @@
     ## MSRV
-    Minimum supported rust version is `v1.60`. Technically `rustc` only needs to be `v1.56` but we need features from `v.1.60` of cargo.
+    Minimum supported rust version is `v1.63`.
     ## LICENSE
@@ Expand Down @@