diff --git a/depends/packages/native_rust.mk b/depends/packages/native_rust.mk index 5ea964acf..7be1811dc 100644 --- a/depends/packages/native_rust.mk +++ b/depends/packages/native_rust.mk @@ -1,12 +1,12 @@ package=native_rust -$(package)_version=1.49.0 +$(package)_version=1.51.0 $(package)_download_path=https://static.rust-lang.org/dist $(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz -$(package)_sha256_hash_linux=8b14446df82f3707d69cf58fed92f18e0bff91621c62baf89288ef70e3e92981 +$(package)_sha256_hash_linux=9e125977aa13f012a68fdc6663629c685745091ae244f0587dd55ea4e3a3e42f $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz -$(package)_sha256_hash_darwin=fe3e248bc4b0ee0a2595693687ad845c8a8bda824a56c9321520bcca02433716 +$(package)_sha256_hash_darwin=765212098a415996b767d1e372ce266caf94027402b269fec33291fffc085ca4 $(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz -$(package)_sha256_hash_freebsd=dced98577e834f511cae8e58290539ad6b8dd40ae512e90d1371f650961bd930 +$(package)_sha256_hash_freebsd=d764ab80889460caca86cda7b7ca2ced80544bb477634adc8cade0e27f4f663b # Mapping from GCC canonical hosts to Rust targets # If a mapping is not present, we assume they are identical, unless $host_os is @@ -15,9 +15,9 @@ $(package)_rust_target_x86_64-pc-linux-gnu=x86_64-unknown-linux-gnu $(package)_rust_target_x86_64-w64-mingw32=x86_64-pc-windows-gnu # Mapping from Rust targets to SHA-256 hashes -$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=c58bd4f0738ff662f70e35c19bfa6b8eb12ad54b0fbdce32ee3e50186c04a969 -$(package)_rust_std_sha256_hash_x86_64-apple-darwin=c4389a8534b8da3ae3570646d68fea9a25268b17ed138867e31d4517312759af -$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=61275ed8bb8350e58e619a99104b8ba9a4bdd715b2ce03e20cb33f5b19e84a9c +$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=a6ed4abe59dfaf2119e2803f67fd8aef757a622ae3ac9a040946af2b02f4c269 +$(package)_rust_std_sha256_hash_x86_64-apple-darwin=2856bc46d3624ae2658897c15388c0c353bea916963a2fc5991c23b920d5678c +$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=55f871bdaf361a26280ca5396297cc7c67237cd86d4ebfe3cbdf9fac14ce0327 define rust_target $(if $($(1)_rust_target_$(2)),$($(1)_rust_target_$(2)),$(if $(findstring darwin,$(3)),x86_64-apple-darwin,$(if $(findstring freebsd,$(3)),x86_64-unknown-freebsd,$(2)))) diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index 690187b06..72ead41bd 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -27,6 +27,3 @@ native_b2 1.75.0 2021-03-01 # Google Test 1.10.0 requires adding CMake to the depends system. googletest 1.10.0 2021-03-01 - -# We will likely switch to the 1.51.0 release when it is out. -native_rust 1.50.0 2021-07-01 diff --git a/rust-toolchain b/rust-toolchain index 7f3a46a84..ba0a71911 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.49.0 +1.51.0 diff --git a/src/rust/src/tests/key_components.rs b/src/rust/src/tests/key_components.rs index 715df7b2f..70caf8dc5 100644 --- a/src/rust/src/tests/key_components.rs +++ b/src/rust/src/tests/key_components.rs @@ -27,7 +27,7 @@ fn key_components() { note_cm: [u8; 32], note_pos: u64, note_nf: [u8; 32], - }; + } // From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/sapling_key_components.py let test_vectors = vec![ diff --git a/src/rust/src/tests/mod.rs b/src/rust/src/tests/mod.rs index cca0983dc..2d1e35041 100644 --- a/src/rust/src/tests/mod.rs +++ b/src/rust/src/tests/mod.rs @@ -20,7 +20,7 @@ fn sapling_generators() { wprb: [u8; 32], vcvb: [u8; 32], vcrb: [u8; 32], - }; + } // From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/sapling_generators.py let sapling_generators = SaplingGenerators { diff --git a/src/rust/src/tests/notes.rs b/src/rust/src/tests/notes.rs index 55da486c0..dc217f54d 100644 --- a/src/rust/src/tests/notes.rs +++ b/src/rust/src/tests/notes.rs @@ -19,7 +19,7 @@ fn notes() { note_cm: [u8; 32], note_pos: u64, note_nf: [u8; 32], - }; + } // From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/sapling_key_components.py let test_vectors = vec![ diff --git a/src/rust/src/tests/signatures.rs b/src/rust/src/tests/signatures.rs index 6002cbfd6..b348794be 100644 --- a/src/rust/src/tests/signatures.rs +++ b/src/rust/src/tests/signatures.rs @@ -14,7 +14,7 @@ fn redjubjub_signatures() { m: [u8; 32], sig: [u8; 64], rsig: [u8; 64], - }; + } // From https://github.com/zcash-hackworks/zcash-test-vectors/blob/master/sapling_signatures.py let test_vectors = vec![