Skip to content

Upgrade to Rust 1.87 #32653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teskje merged 3 commits into from
Jun 6, 2025
Merged

Upgrade to Rust 1.87 #32653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edb6795
*: upgrade to Rust 1.87.0
teskje Jun 4, 2025
7e4e6d1
*: fix/silence clippy lints
teskje Jun 4, 2025
11a7ecf
*: upgrade to llvm 20.1.6
teskje Jun 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ resolver = "2"

[workspace.package]
edition = "2024"
rust-version = "1.86.0"
rust-version = "1.87.0"

[profile.dev]
split-debuginfo = "unpacked"
Expand Down Expand Up @@ -355,6 +355,7 @@ unportable_markdown = "allow"
style = { level = "allow", priority = -1 }
complexity = { level = "allow", priority = -1 }
large_enum_variant = { level = "allow", priority = 0 }
result_large_err = { level = "allow", priority = 0 }
mutable_key_type = { level = "allow", priority = 0 }
stable_sort_primitive = { level = "allow", priority = 0 }
map_entry = { level = "allow", priority = 0 }
Expand Down
62 changes: 31 additions & 31 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ http_archive(
# Version of clang/llvm we use.
#
# We build our own clang toolchain, see the <https://github.com/MaterializeInc/toolchains> repository.
LLVM_VERSION = "19.1.6"
LLVM_VERSION = "20.1.6"

# We have a few variants of our clang toolchain, either improving how it's built or adding new tools.
LLVM_VERSION_SUFFIX = "2"
LLVM_VERSION_SUFFIX = "1"

# Version of the "toolchains_llvm" rule set, _not_ the version of clang/llvm.
#
Expand All @@ -251,10 +251,10 @@ llvm_toolchain(
name = "llvm_toolchain",
llvm_version = LLVM_VERSION,
sha256 = {
"darwin-aarch64": "204a05a12aaa7c59791aea7c70f9c3e4c71e8a414002ae5026faaf4da0e21ef1",
"darwin-x86_64": "3990b08cedea77d1c72fc3ba37bde2b79493bc4214a9fa3b5bc9560338b9741a",
"linux-aarch64": "d5cb31841299c00e72e26a3dc1db7bd980d65e058b952c93a8f5304d1f17c325",
"linux-x86_64": "d0dbc6cecb7798cf5c22eb07413a0773615edfdf24d832f0096e13e88105d51b",
"darwin-aarch64": "02fb0842f75ec34f3df2162c27d01773bd122cf27e01e9e051bb56f9edec66f1",
"darwin-x86_64": "4b382146c4483cf68b730df3329a975505205dc73dc86cfe9f3bacad06e22d49",
"linux-aarch64": "46af59ce8c53338d90b72c401b5560d44bbb02df118f0f0daf08bf897a05f1a9",
"linux-x86_64": "acf8c45aaa3f012d1f140893b5760daafd5965635941a4999c68d2d04a8aae4f",
},
sysroot = {
"darwin-aarch64": "@sysroot_darwin_universal//:sysroot",
Expand Down Expand Up @@ -335,7 +335,7 @@ rules_rust_dependencies()
# Fetch and register the relevant Rust toolchains. We use a custom macro that
# depends on `rules_rust` but cuts down on bloat from their defaults.

RUST_VERSION = "1.86.0"
RUST_VERSION = "1.87.0"

RUST_NIGHTLY_VERSION = "nightly/2025-04-02"

Expand All @@ -349,11 +349,11 @@ rust_toolchains(
{
"aarch64-apple-darwin": {
"stable": {
"cargo": "707781ebdbee7ac3622acb32d6757cf9c08dab2c2f49b6f22978f0571e3682e1",
"clippy": "40ab3c3cd20f946f3fc79f121d5fec8c1e1a0f3e2f21308e21c752c2152b2a80",
"llvm-tools": "ac5c07d387302b8bec2a4abb88ca23dfa2d55982558918e451258b388ba9a864",
"rust-std": "04f3b73e5bcbd5dfabed96726c0b5ba22c9e5fec6952932e01e3b89f0798f7d9",
"rustc": "2fd62ce8a9d0c58e92a248820d5a22a0277bdc5efd200ce731cc87e9816ec5e2",
"cargo": "2ca1a3985075bc8fa1638a8a7eb04905af417e3c4833604d52e012f186a4c56d",
"clippy": "1b15eeccb24141ab14f1aebbd7bdd33012dd6f2bbf43d947f2e0939800df42b8",
"llvm-tools": "cdeb364a8b4781452ec96572467b9eed81d4211cd35940b9f7f397a114af7cd2",
"rust-std": "6140cd97ec645291fa93ae227eb112a5a30e9b9757565d395fc93b57b30d8a1a",
"rustc": "bdf07b74624a35f41b6d4455062231136528ca2bc1ee2b516868ae013e281d30",
},
"nightly": {
"cargo": "0e8376dc79c840063a8cdeeff0f53e255fb91ec4ead2ca5109a5ec9c3f13cf54",
Expand All @@ -365,11 +365,11 @@ rust_toolchains(
},
"aarch64-unknown-linux-gnu": {
"stable": {
"cargo": "73e3e8a96b044de32fc242129fef9a4d332f4a0fe7265eff4272d3f3d9abde93",
"clippy": "0c938032791951d5fce10d53ec35e12fba3e341b9b2cfd94bf6b6ce9582d2257",
"llvm-tools": "462fdcbe9d2bc048d8cf9bf6d3b7fe168471ed39500d70111c874e6f32fff4b4",
"rust-std": "aa0c2aff7bb69fb970e34d194830a3e9692b1299731b33228dee5f730d42e94e",
"rustc": "113e4123cb4a3903d72dbf44db91938e7f2c37f3e73b04d10359145e9e395eeb",
"cargo": "ee961f7e7ea9ea48d6d50269abfbba65ecb68ef95ffeb73cef2fc1aa73b75d06",
"clippy": "1cdf15a797a796a4513743d2b0d1bde54275509761cf8bfcc869c9a8d0210bb7",
"llvm-tools": "c723b7b1d7df57b3a175fa442454db1f764f2233d5bf8a69116e0777471e2709",
"rust-std": "cbbe24a9830f07d564813d629594dd9b8893ee8db2f3a02d67b4747d695cd91b",
"rustc": "4523e003a77db00da419685e1429315ebfc1fec8b2ab5ceaad90971e9be96b49",
},
"nightly": {
"cargo": "8f0a8b12effea97fd1930747dbd70857225a5465037844bb39ed9d17e01abfdd",
Expand All @@ -381,11 +381,11 @@ rust_toolchains(
},
"x86_64-apple-darwin": {
"stable": {
"cargo": "85560e557f81b329407a8143281fa309e6a9d01a8104de6742081a2771f49df1",
"clippy": "e38499209dd7da03990cdbbf4b7abebc084e4b0191b7252be238a17f96b87c42",
"llvm-tools": "98e0408a0dc18bd9ba394ef40980775ab54e9b138dddd5d2141d2f0634676010",
"rust-std": "e4c344cbb7d6e7088941a153fd48d57cc22041905b38552e7c7dd97f5bf68259",
"rustc": "ff50df0bc0d1ab517746b2bf742afd13cb543cdeebb1b847f7c069cb6b3feb19",
"cargo": "cf12c42e436e3960ee55a19b90b575bb1f4ce73f2820871e53c21b13ceacb3b0",
"clippy": "47b62e75295f8a327063c5ad11c0a2d32f590f85920da7211396d267b29f5cac",
"llvm-tools": "aaa8fe29e325a7a7ae792b1bcf601411b89ca76dfef44e1147c23c4c18305b70",
"rust-std": "1595f38b5bffce3554c6603252157e2017a20f14ef16520da3bea22a9a6527a6",
"rustc": "0823c207629121f95087fe366ddfb0d96016cc3b50f7d1ea9e9f2d478ff391d5",
},
"nightly": {
"cargo": "d7c58810f851cb34110d5434a4f66f8bf444e896eb951e9cb744a7bef815c9a1",
Expand All @@ -397,11 +397,11 @@ rust_toolchains(
},
"x86_64-unknown-linux-gnu": {
"stable": {
"cargo": "9dccd8fb635701a173fa74335d91837a264c0a1d7009d5f047851de217ddeeab",
"clippy": "9a34aefbbdf8b5bc6dbaad8555cf12577d9ef60b167211515feadbd16afdcb28",
"llvm-tools": "fbcc69f9c140a5fe0621c280628372233644818eb1826baadb303acdbc6e6395",
"rust-std": "348e96d4d5261895d6014c428b54b40fd4c210f453b889b4180e19916c6b594e",
"rustc": "c2c7f2b80ddd43834e53c25840ba68491671ac52af25f076059011677d922083",
"cargo": "f1fb338417952ea7ee7b5c4150f05b7f2d9d47d92499cd7a8859d4c78823f710",
"clippy": "56cc2ce095cf6fc2b680ed2527b7bf6fbe45819edb4a7258483f521f5d37c971",
"llvm-tools": "52cbd5a6ebedf55cc27751b1014ef636ff245f030b7fe3549bfb1660823df3da",
"rust-std": "f4dff0fe501a8c8e1d3fed5213096e18a8c4fefbbdfd78457a3638a449f99fdd",
"rustc": "923bcb7be267579a79ae9a11126739619f180a6544bcc1c0c3a752c1aecd6e7a",
},
"nightly": {
"cargo": "74dc885d2f1374ca9999c094ab411b3d0abc9616ad2ea39c5dab429f0321e15d",
Expand Down Expand Up @@ -436,10 +436,10 @@ rust_bindgen_dependencies()
bindgen_toolchains(
"{0}-{1}".format(LLVM_VERSION, LLVM_VERSION_SUFFIX),
{
"darwin_aarch64": "sha256-8u9xQ+3q4SO810j6wue+lM6njkucOyChRQRTk246tSE=",
"darwin_x86_64": "sha256-rf03+b1xaxYpQiSkYTDazfr1jcfn5O7dTtd1rBRog7s=",
"linux_aarch64": "sha256-e8Wj26Md/qLdw23Eq0FxbVsTNQa/4jKmrfeUEJ078iE=",
"linux_x86_64": "sha256-Dgtp3+gN+Iq0POdhkl8ny/tKdV8hG/ZrtLOLYPgc/4A=",
"darwin_aarch64": "sha256-QxhHE2vvRcbe1ppF9ZonKWa4Y6AwnP8cVsCO0xLkZvU=",
"darwin_x86_64": "sha256-PcZ4VlQ8vxZP3mffLXj3vxh7VImDfIUvFdqR9z+uFNc=",
"linux_aarch64": "sha256-W8GBaB49peXQunPziisAWm8K6xLF/WcOijOHXlHe6Bk=",
"linux_x86_64": "sha256-8TXbBywRoUcZ/Aulm2Ps+FOU2RBKWA32AQDKCPoOyUw=",
},
)

Expand Down
2 changes: 1 addition & 1 deletion bin/lint-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#
# lint-versions - Check rust version

grep "rust-version = " Cargo.toml | grep -q "1\.86\.0" || \
grep "rust-version = " Cargo.toml | grep -q "1\.87\.0" || \
(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)
8 changes: 6 additions & 2 deletions misc/bazel/c_deps/rust-sys/BUILD.rocksdb.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,14 @@ filegroup(
cmake(
name = "rocksdb",
build_args = ["-j8"],
# rocksdb requires these flags to be enabled, all instances we run on support them.
copts = select(
copts = [
# https://github.com/facebook/rocksdb/issues/13558
"-Wno-nontrivial-memaccess",
] + select(
{
"@platforms//cpu:x86_64": [
# rocksdb requires these flags to be enabled, all instances we
# run on support them.
"-msse4.2",
"-mpclmul",
],
Expand Down
2 changes: 1 addition & 1 deletion misc/bazel/rust_deps/cxxbridge-cmd/Cargo.cxxbridge-cmd.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "31375442a86d5fa165caff330ca8d4971a9bd98eaba3a97b79b3d94f4d93e1ad",
"checksum": "30dd886db882ffba17081e34328072a08e2ead83962189f0fa1dbb0e7751976c",
"crates": {
"anstyle 1.0.10": {
"name": "anstyle",
Expand Down
2 changes: 2 additions & 0 deletions misc/python/materialize/cli/gen-lints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
# and the suggested solution—boxing the large variant—might actually result
# in slower code due to the allocation.
("large_enum_variant", 0),
# A specialization of `large_enum_variant`; similar arguments apply.
("result_large_err", 0),
Copy link
Contributor Author

@teskje teskje Jun 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I actually think enabling this lint might be useful. But fixing all the instances it finds is a bunch of effort and I didn't want to block the fix for the std::sync::mpsc safety bug on it.

# clippy::mutable_key_type disallows using internally mutable types as keys
# in `HashMap`, because their order could change. This is a good lint in
# principle, but its current implementation is too strict -- it disallows
Expand Down
1 change: 1 addition & 0 deletions misc/wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ unportable_markdown = "allow"
style = { level = "allow", priority = -1 }
complexity = { level = "allow", priority = -1 }
large_enum_variant = { level = "allow", priority = 0 }
result_large_err = { level = "allow", priority = 0 }
mutable_key_type = { level = "allow", priority = 0 }
stable_sort_primitive = { level = "allow", priority = 0 }
map_entry = { level = "allow", priority = 0 }
Expand Down
2 changes: 1 addition & 1 deletion src/frontegg-auth/src/auth.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ impl AuthenticatorInner {
tenant_id: msg.claims.tenant_id,
// The user is an administrator if they have the admin role that the
// `Authenticator` has been configured with.
is_admin: msg.claims.roles.iter().any(|r| *r == self.admin_role),
is_admin: msg.claims.roles.contains(&self.admin_role),
_private: (),
})
}
Expand Down
4 changes: 2 additions & 2 deletions src/persist-client/src/internal/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3662,7 +3662,7 @@ pub(crate) mod tests {

// When a writer is present, non-writes don't gc.
let writer_id = WriterId::new();
state.collections.compare_and_append(
let _ = state.collections.compare_and_append(
&hollow(1, 2, &["key1"], 1),
&writer_id,
now,
Expand Down Expand Up @@ -3777,7 +3777,7 @@ pub(crate) mod tests {
// When a writer is present, non-writes don't gc.
let writer_id = WriterId::new();
let now = SYSTEM_TIME.clone();
state.collections.compare_and_append(
let _ = state.collections.compare_and_append(
&hollow(1, 2, &["key1"], 1),
&writer_id,
now(),
Expand Down