Merge pull request #74 from trilitech/emturner@ytpksvvloplq

bump: MSRV -> 1.64.0

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Setup Rust (regular)
         if: matrix.sanitizer != 'address'
-        uses: dtolnay/rust-toolchain@1.61.0
+        uses: dtolnay/rust-toolchain@1.64.0
         with:
           target: wasm32-unknown-unknown
       - name: Setup Rust (for sanitizer)
@@ -32,15 +32,15 @@ jobs:
       - name: Settings for cargo in Linux
         if: matrix.sanitizer == 'address'
         run: |
-            echo '[build]' >> ~/.cargo/config
-            echo 'rustflags = ["-Z", "sanitizer=address"]' >> ~/.cargo/config
-            echo 'rustdocflags = ["-Z", "sanitizer=address"]' >> ~/.cargo/config
-            echo 'target = "x86_64-unknown-linux-gnu"' >> ~/.cargo/config
+            echo '[build]' >> ~/.cargo/config.toml
+            echo 'rustflags = ["-Z", "sanitizer=address"]' >> ~/.cargo/config.toml
+            echo 'rustdocflags = ["-Z", "sanitizer=address"]' >> ~/.cargo/config.toml
+            echo 'target = "x86_64-unknown-linux-gnu"' >> ~/.cargo/config.toml
       - name: Settings for cargo in OSX
         if: runner.os == 'macOS'
         run: |
-            echo '[build]' >> ~/.cargo/config
-            echo 'rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]' >> ~/.cargo/config
+            echo '[build]' >> ~/.cargo/config.toml
+            echo 'rustflags = ["-C", "link-args=-Wl,-undefined,dynamic_lookup"]' >> ~/.cargo/config.toml
       - name: APT dependencies
         if: runner.os == 'Linux'
         run: |

.github/workflows/clippy.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.61.0
+      - uses: dtolnay/rust-toolchain@1.64.0
         with:
           components: clippy
       - name: lint

.github/workflows/rustfmt.yml

@@ -11,8 +11,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.61.0
+      - uses: dtolnay/rust-toolchain@1.64.0
         with:
           components: rustfmt
       - name: check formatting
-        run: cargo fmt --all -- --check
+        run: cargo fmt --all -- --check

CHANGELOG.md

@@ -35,6 +35,7 @@ parameterized by the lifetime of the input byte slice.
 - `PublicKeySignatureVerifier` now requires the explicitly correct signature kind for the given public key.
 - Update `blst` dependency to `0.3.12` to improve RISC-V compatibility.
 - Update `num-bigint` dependency to `0.4` to improve WASM compatibility.
+- Minimum supported rust version bumped to `1.64`.
 
 ### Deprecated
 

Cargo.toml

@@ -1,6 +1,7 @@
 cargo-features = ["named-profiles"]
 
 [workspace]
+resolver = "2"
 members = [
     "crypto",
     "tezos-encoding",

crypto/Cargo.toml

@@ -3,7 +3,7 @@ name = "tezos_crypto_rs"
 version = "0.5.2"
 authors = ["TriliTech <contact@trili.tech>"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 license = "MIT"
 keywords = ["tezos"]
 categories = ["cryptography::cryptocurrencies"]

crypto/src/blake2b.rs

@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 #[cfg_attr(feature = "fuzzing", derive(fuzzcheck::DefaultMutator))]
-#[derive(Serialize, Deserialize, Error, Debug, PartialEq, Clone, Copy)]
+#[derive(Serialize, Deserialize, Error, Debug, PartialEq, Eq, Clone, Copy)]
 pub enum Blake2bError {
     #[error("Output digest length must be between 16 and 64 bytes.")]
     InvalidLength,

crypto/src/hash.rs

@@ -339,7 +339,7 @@ unknown_sig!(Secp256k1Signature);
 unknown_sig!(P256Signature);
 
 /// Note: see Tezos ocaml lib_crypto/base58.ml
-#[derive(Debug, Copy, Clone, PartialEq, strum_macros::AsRefStr)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, strum_macros::AsRefStr)]
 pub enum HashType {
     // "\087\082\000" (* Net(15) *)
     ChainId,

tezos-encoding-derive/Cargo.toml

@@ -3,7 +3,7 @@ name = "tezos_data_encoding_derive"
 version = "0.5.2"
 authors = ["TriliTech <contact@trili.tech>"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 license = "MIT"
 keywords = ["tezos"]
 categories = ["encoding"]

tezos-encoding-derive/src/encoding.rs

@@ -83,7 +83,7 @@ pub enum Encoding<'a> {
     Dynamic(Option<syn::Expr>, Box<Encoding<'a>>, Span),
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Display, FromStr)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Display, FromStr)]
 pub enum PrimitiveEncoding {
     Int8,
     Uint8,

tezos-encoding/Cargo.toml

@@ -3,7 +3,7 @@ name = "tezos_data_encoding"
 version = "0.5.2"
 authors = ["TriliTech <contact@trili.tech>"]
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.64"
 license = "MIT"
 keywords = ["tezos"]
 categories = ["encoding"]

tezos-encoding/src/bit_utils.rs

@@ -9,7 +9,7 @@ use bit_vec::BitVec;
 use thiserror::Error;
 
 /// An error triggered when working with [Bits].
-#[derive(Debug, Error, PartialEq)]
+#[derive(Debug, Error, PartialEq, Eq)]
 pub enum BitsError {
     /// Index is out of range
     #[error("index out of range")]

tezos-encoding/src/enc.rs

@@ -173,7 +173,7 @@ where
     T: ?Sized + BinWriter,
 {
     fn bin_write(&self, output: &mut Vec<u8>) -> BinResult {
-        (&**self).bin_write(output)
+        (**self).bin_write(output)
     }
 }
 

tezos-encoding/src/nom.rs

@@ -47,7 +47,7 @@ pub mod error {
     }
 
     /// Decoding error kind.
-    #[derive(Debug, PartialEq)]
+    #[derive(Debug, PartialEq, Eq)]
     pub enum DecodeErrorKind {
         /// Nom-specific error.
         Nom(ErrorKind),
@@ -68,7 +68,7 @@ pub mod error {
     }
 
     /// Specific bounded encoding kind.
-    #[derive(Debug, PartialEq, Clone)]
+    #[derive(Debug, PartialEq, Eq, Clone)]
     pub enum BoundedEncodingKind {
         String,
         List,