From d01129e752f37a08830a4227303c001723806f92 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Thu, 16 Feb 2023 15:45:29 +0000 Subject: [PATCH] depends: Update Rust to 1.67.1 --- .github/workflows/lints.yml | 8 ++++---- Cargo.toml | 2 +- depends/packages/native_rust.mk | 29 +++++++++++++++++------------ rust-toolchain.toml | 2 +- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.github/workflows/lints.yml b/.github/workflows/lints.yml index bcb957bc6..fff353dcf 100644 --- a/.github/workflows/lints.yml +++ b/.github/workflows/lints.yml @@ -75,19 +75,19 @@ jobs: if: always() rust-clippy: - name: Clippy (1.64.0) + name: Clippy (1.67.1) runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.64.0 + toolchain: 1.67.1 components: clippy override: true - name: Run clippy uses: actions-rs/clippy-check@v1 with: - name: Clippy (1.64.0) + name: Clippy (1.67.1) token: ${{ secrets.GITHUB_TOKEN }} args: --all-features --all-targets -- -D warnings @@ -98,7 +98,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.64.0 + toolchain: 1.67.1 override: true - run: rustup component add rustfmt - uses: actions-rs/cargo@v1 diff --git a/Cargo.toml b/Cargo.toml index 9f201bd20..bb3dc9733 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ repository = "https://github.com/zcash/zcash" readme = "README.md" license = "MIT OR Apache-2.0" edition = "2018" -rust-version = "1.64" +rust-version = "1.67.1" [package.metadata.vet] store = { path = "./qa/supply-chain" } diff --git a/depends/packages/native_rust.mk b/depends/packages/native_rust.mk index 93b4e9f86..33d1f6969 100644 --- a/depends/packages/native_rust.mk +++ b/depends/packages/native_rust.mk @@ -3,16 +3,16 @@ package=native_rust # ./contrib/devtools/update-rust-hashes.sh # The Rust compiler should use the same LLVM version as the Clang compiler; you # can check this with `rustc --version -v`. -$(package)_version=1.64.0 +$(package)_version=1.67.1 $(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=a893977f238291370ab96726a74b6b9ae854dc75fbf5730954d901a93843bf9b +$(package)_sha256_hash_linux=652a8966436c4e97b127721d9130810e1cdc8dfdf526fad68c9c1f6281bd02a3 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz -$(package)_sha256_hash_darwin=b6003d49fb857ff8dc105a3ccba98b851cd3e7d874005acb92284fd1113adc0d +$(package)_sha256_hash_darwin=020702c9564f53e18ac880db77c2f6b660a24ea372e4fda3f0c1ef2f8b9c74b9 $(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz -$(package)_sha256_hash_freebsd=f188a9a7f947d559add5aa7b5aa218d9c5177237eb9ea62109347f0f1464e3a2 +$(package)_sha256_hash_freebsd=d0ba56d6601542ae19af47b63671d7b0f516b429202c32339841ae60d33bd73a $(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz -$(package)_sha256_hash_aarch64_linux=7d8860572431bd4ee1b9cd0cd77cf7ff29fdd5b91ed7c92a820f872de6ced558 +$(package)_sha256_hash_aarch64_linux=8edee248eed4b17c09b3d7b0096944b7e5992dd1119a28429c0b6b4d39a9613c # Mapping from GCC canonical hosts to Rust targets # If a mapping is not present, we assume they are identical, unless $host_os is @@ -21,15 +21,20 @@ $(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=2b425658f84793d5bbf00ce545f410ec6454add202cce27a718d81e0233e7007 -$(package)_rust_std_sha256_hash_x86_64-apple-darwin=eb2f7c51f63973765f01efe509ccd2f26345d4bf0d77695adb4198a0899ae648 -$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=dcf87f97432adf7228e907b551d9b73f1ab16f79dc5da0724a227b7ffdaf57b4 -$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=c91edba781ba56f35f2dba56a268d41866ea9bb5f6ffb9d342635f66b836898b +$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=19f3afbe43c7e041b8b5c0143101d3ede92f73f720709ef1578ad5d259ad6181 +$(package)_rust_std_sha256_hash_x86_64-apple-darwin=0d1e93cada608ee1b4474af417dea2ac06590ba4cc963a9b9f5c7164ddf42b87 +$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=5088bfaf1d4b316e71655fcefb084cfa07876bd2ce832eb1e4b705ff27b3ad8a +$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=aa6ac1844b06143a7533e44d129083d2c28a1d34953dc432c8c3591886cc892c 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)))) endef +define $(package)_set_vars +$(package)_stage_opts=--disable-ldconfig +$(package)_stage_build_opts=--without=rust-docs-json-preview,rust-docs +endef + ifneq ($(canonical_host),$(build)) $(package)_rust_target=$(call rust_target,$(package),$(canonical_host),$(host_os)) $(package)_exact_file_name=rust-std-$($(package)_version)-$($(package)_rust_target).tar.gz @@ -54,12 +59,12 @@ define $(package)_extract_cmds endef define $(package)_stage_cmds - bash ./install.sh --without=rust-docs --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig && \ - ../$(canonical_host)/install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig + bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) $($(package)_stage_opts) $($(package)_stage_build_opts) && \ + ../$(canonical_host)/install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) $($(package)_stage_opts) endef else define $(package)_stage_cmds - bash ./install.sh --without=rust-docs --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) --disable-ldconfig + bash ./install.sh --destdir=$($(package)_staging_dir) --prefix=$(build_prefix) $($(package)_stage_opts) $($(package)_stage_build_opts) endef endif diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 10add70bb..588ffd578 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.64.0" +channel = "1.67.1"