From 9ec7bba9b6a14b4d2200b86a602f05503861e392 Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Fri, 16 Feb 2024 16:32:15 +0100 Subject: [PATCH] Bump Rust version to 1.74.1 Fixes: https://github.com/MaterializeInc/materialize/issues/24818 --- Cargo.lock | 45 ++++++++++++++++++++++------------- Cargo.toml | 2 +- bin/ci-builder | 2 +- bin/lint-versions | 2 +- ci/builder/Dockerfile | 18 +++++++------- misc/wasm/Cargo.toml | 2 +- src/timely-util/Cargo.toml | 2 +- src/workspace-hack/Cargo.toml | 4 ++-- 8 files changed, 45 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 608b098aea5eb..bab95319894eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,15 +36,16 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.0" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e6e951cfbb2db8de1828d49073a113a29fd7117b1596caa781a258c7e38d72" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" dependencies = [ "cfg-if", "const-random", "getrandom", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -1322,23 +1323,21 @@ checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "const-random" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" dependencies = [ "const-random-macro", - "proc-macro-hack", ] [[package]] name = "const-random-macro" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ "getrandom", "once_cell", - "proc-macro-hack", "tiny-keccak", ] @@ -1389,9 +1388,9 @@ dependencies = [ [[package]] name = "crc32c" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfea2db42e9927a3845fb268a10a72faed6d416065f77873f05e411457c363e" +checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" dependencies = [ "rustc_version", ] @@ -7171,12 +7170,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.69" @@ -10066,6 +10059,26 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "zeroize" version = "1.5.7" diff --git a/Cargo.toml b/Cargo.toml index 3b256d0ce8ca7..c68dc624d9fea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,7 +117,7 @@ resolver = "2" [workspace.package] edition = "2021" -rust-version = "1.74.0" +rust-version = "1.74.1" [profile.dev] split-debuginfo = "unpacked" diff --git a/bin/ci-builder b/bin/ci-builder index b4302952261e0..d3e8c714ef140 100755 --- a/bin/ci-builder +++ b/bin/ci-builder @@ -16,7 +16,7 @@ set -euo pipefail -NIGHTLY_RUST_DATE=2023-11-19 +NIGHTLY_RUST_DATE=2024-02-15 cd "$(dirname "$0")/.." diff --git a/bin/lint-versions b/bin/lint-versions index ac4d7ce14b286..0468d43849f38 100755 --- a/bin/lint-versions +++ b/bin/lint-versions @@ -11,5 +11,5 @@ # # lint-versions - Check rust version -grep "rust-version = " Cargo.toml | grep -q "1\.74\.0" || \ +grep "rust-version = " Cargo.toml | grep -q "1\.74\.1" || \ (echo "Please validate new Rust versions for compilation time performance regressions or ask Team Testing to do so. Afterwards change the tested version in bin/lint-versions" && exit 1) diff --git a/ci/builder/Dockerfile b/ci/builder/Dockerfile index d53e84c149038..f6e285eaca6ae 100644 --- a/ci/builder/Dockerfile +++ b/ci/builder/Dockerfile @@ -190,16 +190,16 @@ RUN mkdir rust \ && gpg --verify rust.asc rust.tar.gz \ && tar -xzf rust.tar.gz -C /usr/local/lib/rustlib/ --strip-components=4 \ && rm -rf rust.asc rust.tar.gz rust \ - && cargo install --root /usr/local --version "=0.8.0" --locked cargo-vet \ - && cargo install --root /usr/local --version "=0.6.0" --locked cargo-about \ - && cargo install --root /usr/local --version "=2.0.2" --locked cargo-deb \ - && cargo install --root /usr/local --version "=0.12.2" --locked cargo-deny \ + && cargo install --root /usr/local --version "=0.9.1" --locked cargo-vet \ + && cargo install --root /usr/local --version "=0.6.1" --locked cargo-about \ + && cargo install --root /usr/local --version "=2.0.6" --locked cargo-deb \ + && cargo install --root /usr/local --version "=0.14.11" --locked cargo-deny \ && cargo install --root /usr/local --version "=0.1.0" --locked cargo-deplint \ - && cargo install --root /usr/local --version ="0.9.28" --locked cargo-hakari \ - && cargo install --root /usr/local --version "=0.9.63" --locked cargo-nextest \ - && cargo install --root /usr/local --version "=0.5.37" --locked cargo-llvm-cov \ - && cargo install --root /usr/local --version "=0.1.43" --features=vendored-openssl cargo-udeps \ - && cargo install --root /usr/local --version "=0.2.15" --no-default-features --features=s3,openssl/vendored sccache \ + && cargo install --root /usr/local --version "=0.9.29" --locked cargo-hakari \ + && cargo install --root /usr/local --version "=0.9.67" --locked cargo-nextest \ + && cargo install --root /usr/local --version "=0.6.5" --locked cargo-llvm-cov \ + && cargo install --root /usr/local --version "=0.1.46" --features=vendored-openssl cargo-udeps \ + && cargo install --root /usr/local --version "=0.7.7" --no-default-features --features=s3,openssl/vendored sccache \ && cargo install --root /usr/local --version "=0.3.6" cargo-binutils \ && cargo install --root /usr/local --version "=0.12.1" wasm-pack diff --git a/misc/wasm/Cargo.toml b/misc/wasm/Cargo.toml index a6953bea4c5ba..c4e083650e029 100644 --- a/misc/wasm/Cargo.toml +++ b/misc/wasm/Cargo.toml @@ -7,7 +7,7 @@ members = [ [workspace.package] edition = "2021" -rust-version = "1.74.0" +rust-version = "1.74.1" [workspace.metadata.vet] store = { path = "../cargo-vet" } diff --git a/src/timely-util/Cargo.toml b/src/timely-util/Cargo.toml index 6dfc1c7337d9b..fe7a07ce6ea73 100644 --- a/src/timely-util/Cargo.toml +++ b/src/timely-util/Cargo.toml @@ -19,7 +19,7 @@ mz-ore = { path = "../ore", features = ["async", "tracing_", "test"] } workspace-hack = { version = "0.0.0", path = "../workspace-hack" } tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread", "time"] } num-traits = "0.2" -ahash = { version = "0.8.0", default_features = false } +ahash = { version = "0.8.8", default_features = false } uuid = { version = "1.7.0", features = ["serde", "v4"] } [package.metadata.cargo-udeps.ignore] diff --git a/src/workspace-hack/Cargo.toml b/src/workspace-hack/Cargo.toml index 7df78c5ab6ace..28696d99fcafe 100644 --- a/src/workspace-hack/Cargo.toml +++ b/src/workspace-hack/Cargo.toml @@ -14,7 +14,7 @@ publish = false ### BEGIN HAKARI SECTION [dependencies] -ahash = { version = "0.8.0" } +ahash = { version = "0.8.8" } anyhow = { version = "1.0.66", features = ["backtrace"] } async-compression = { version = "0.4.5", default-features = false, features = ["gzip", "tokio", "zstd"] } aws-config = { version = "1.1.1", default-features = false, features = ["sso"] } @@ -128,7 +128,7 @@ zeroize = { version = "1.5.7", features = ["serde"] } zstd-sys = { version = "2.0.9", features = ["std"] } [build-dependencies] -ahash = { version = "0.8.0" } +ahash = { version = "0.8.8" } anyhow = { version = "1.0.66", features = ["backtrace"] } async-compression = { version = "0.4.5", default-features = false, features = ["gzip", "tokio", "zstd"] } aws-config = { version = "1.1.1", default-features = false, features = ["sso"] }