Skip to content

Commit d90e63b

Browse files
authored
rust: Upgrade to v1.80.1 to pickup fix (#29038)
Rust previously had a bug related to comparison of floats, see rust-lang/rust#128243. ### Motivation Upgrades Rust to pickup fix ### Checklist - [x] This PR has adequate test coverage / QA involvement has been duly considered. ([trigger-ci for additional test/nightly runs](https://trigger-ci.dev.materialize.com/)) - [x] This PR has an associated up-to-date [design doc](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/README.md), is a design doc ([template](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/design/00000000_template.md)), or is sufficiently small to not require a design. <!-- Reference the design in the description. --> - [x] If this PR evolves [an existing `$T ⇔ Proto$T` mapping](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/command-and-response-binary-encoding.md) (possibly in a backwards-incompatible way), then it is tagged with a `T-proto` label. - [x] If this PR will require changes to cloud orchestration or tests, there is a companion cloud PR to account for those changes that is tagged with the release-blocker label ([example](MaterializeInc/cloud#5021)). <!-- Ask in #team-cloud on Slack if you need help preparing the cloud PR. --> - [x] If this PR includes major [user-facing behavior changes](https://github.com/MaterializeInc/materialize/blob/main/doc/developer/guide-changes.md#what-changes-require-a-release-note), I have pinged the relevant PM to schedule a changelog post.
1 parent 360f19f commit d90e63b

File tree

5 files changed

+81
-26
lines changed

5 files changed

+81
-26
lines changed

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ resolver = "2"
229229

230230
[workspace.package]
231231
edition = "2021"
232-
rust-version = "1.80.0"
232+
rust-version = "1.80.1"
233233

234234
[profile.dev]
235235
split-debuginfo = "unpacked"

WORKSPACE

+16-16
Original file line numberDiff line numberDiff line change
@@ -230,32 +230,32 @@ rules_rust_dependencies()
230230
# Fetch and register the relevant Rust toolchains. We use a custom macro that
231231
# depends on `rules_rust` but cuts down on bloat from their defaults.
232232

233-
RUST_VERSION = "1.80.0"
233+
RUST_VERSION = "1.80.1"
234234

235235
load("//misc/bazel/toolchains:rust.bzl", "rust_toolchains")
236236
rust_toolchains(
237237
RUST_VERSION,
238238
{
239239
"aarch64-apple-darwin": {
240-
"rustc": "d34f0f41c6a8314ceb43c237c4b206ec5d14c739c2bef973c9c5b38112462317",
241-
"clippy": "e90c733409848078753a30462d945f92b442bfeff4861da4de431c8ccee4570b",
242-
"cargo": "fbcfe209260d3ce7f588d5a01985fb93d940a29e359f4cf8e5fdfc4ab01992a9",
243-
"llvm-tools": "c159713f530a5d60e9f09662e1829d18d3ad19c5cba42997b4b7eaeebc3845f8",
244-
"rust-std": "f1cf42b99fa1a8c2066f10f1cd7f01973a47174b0007f903dcba8734aedc9214",
240+
"rustc": "ada84b7c4521b10f54ab73d34916cb45fb68cc928b16c9e1be39f89406b84c86",
241+
"clippy": "f1f6772c917008d170e4cdc7ae10e370cfbe11da6105bf5913a1b43ea126b0f1",
242+
"cargo": "4649742a7bfc4a46036e47ea057d60bf8301c0299054c9785ee37947b2d1294c",
243+
"llvm-tools": "725bb2381dd287fb070a05eb6092fc5b4000ba69eb2cb27790c0f40fd248a56a",
244+
"rust-std": "ddd123723fe4576a155ce0190da5f16a2c067cbd5b1a2c23b301592568e5752d",
245245
},
246246
"aarch64-unknown-linux-gnu": {
247-
"rustc": "4d3d63adeab52cf594e01d5a9f7edcb1c5dddf0065acf0733deea595a780d9bf",
248-
"clippy": "68c764dfeaa7ff10abd101d23b3b6386c097d5d47339701ad0badbb2deb48b6c",
249-
"cargo": "d3db9209bc5b169075e1055b6bde68f7e8674251e5aaf765a644123783cd2f72",
250-
"llvm-tools": "ab8b6d49e08203ff65278e7288e05bb9f993d41b615ce7b5937edb521494ea86",
251-
"rust-std": "05a20520e7677c360433bba427fc66060cecbf3c6db168235007a8f57e8208c9",
247+
"rustc": "4ca87875f8a23ef1f23d60a958a0dc798e2b8e97bf6782b2ec534026181fa72c",
248+
"clippy": "fcda253a6704f612310696f25f161c880f16ec8be6b640ccf5fe26245c822efc",
249+
"cargo": "6973b542f54ade0215becd34a06d011e4c35a8091a27ac667d0438ebc45a935e",
250+
"llvm-tools": "2574807dcf8a1d68adc57c42c4caa812ac3d54f376b16b536c8073c60877c680",
251+
"rust-std": "07238d367cfba20bf80150f725234b877b11bc3ab82d04ed0ccc95375e9cedd8",
252252
},
253253
"x86_64-unknown-linux-gnu": {
254-
"rustc": "5e01169d11df14ab8ba08cb59dd727edb108e6a73704c166856e3c9d1ddf602c",
255-
"clippy": "1de5580cc9c88be835f1ba65fb7ae48ad141e3c7b01a862f3192ec5e9c2c640d",
256-
"cargo": "d4c25ff547fdb0991dc621f4c95a8d103ce52dea32bd8ee9bf7bdc8beea3cb58",
257-
"llvm-tools": "04165144b5739ab789c598c7f3cf47b91a2def3f14e320c945221c878b0a6127",
258-
"rust-std": "965176313044bb69b6dbe1b8709109582557ad6efc99771b2d99fbc54e5dce4c",
254+
"rustc": "5c7fce7a0323b8669b4e17ec370b38a5f207fcdcd5c66b83c877b72e252d561e",
255+
"clippy": "39253ce4ecb036977686f5a8cc183de295cf280766678201f919c5655e3dd063",
256+
"cargo": "863c016fc458b1fa8809d7b66dcccd272f8b6b2e8a42c89b7dff4b619f3d3940",
257+
"llvm-tools": "86e441024b0e538ed69fa0098be48592caae6fc28097f7630b906be276c79622",
258+
"rust-std": "e7b766fce1cd89c02bde33f8cc3a81f341c52677258a546df2bee1c7090e9fc5",
259259
},
260260
"x86_64-apple-darwin": {},
261261
}

bin/ci-builder

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
set -euo pipefail
1818

19-
NIGHTLY_RUST_DATE=2024-08-01
19+
NIGHTLY_RUST_DATE=2024-08-14
2020

2121
cd "$(dirname "$0")/.."
2222

bin/lint-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#
1212
# lint-versions - Check rust version
1313

14-
grep "rust-version = " Cargo.toml | grep -q "1\.80\.0" || \
14+
grep "rust-version = " Cargo.toml | grep -q "1\.80\.1" || \
1515
(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)

misc/bazel/rust_deps/cxxbridge-cmd/Cargo.cxxbridge-cmd.lock

+62-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "ce47a0d13282a9cb60a1a2d25fde0833f16e9d56e0db6603f5e327b5d80db264",
2+
"checksum": "f07a4418dc05ac3d16b911c5258e6f5027568253486acfd470bde0c5845725e1",
33
"crates": {
44
"anstyle 1.0.4": {
55
"name": "anstyle",
@@ -47,14 +47,14 @@
4747
],
4848
"license_file": "LICENSE-APACHE"
4949
},
50-
"cc 1.1.8": {
50+
"cc 1.1.12": {
5151
"name": "cc",
52-
"version": "1.1.8",
52+
"version": "1.1.12",
5353
"package_url": "https://github.com/rust-lang/cc-rs",
5454
"repository": {
5555
"Http": {
56-
"url": "https://static.crates.io/crates/cc/1.1.8/download",
57-
"sha256": "504bdec147f2cc13c8b57ed9401fd8a147cc66b67ad5cb241394244f2c947549"
56+
"url": "https://static.crates.io/crates/cc/1.1.12/download",
57+
"sha256": "68064e60dbf1f17005c2fde4d07c16d8baa506fd7ffed8ccab702d93617975c7"
5858
}
5959
},
6060
"targets": [
@@ -76,8 +76,17 @@
7676
"compile_data_glob": [
7777
"**"
7878
],
79+
"deps": {
80+
"common": [
81+
{
82+
"id": "shlex 1.3.0",
83+
"target": "shlex"
84+
}
85+
],
86+
"selects": {}
87+
},
7988
"edition": "2018",
80-
"version": "1.1.8"
89+
"version": "1.1.12"
8190
},
8291
"license": "MIT OR Apache-2.0",
8392
"license_ids": [
@@ -592,7 +601,7 @@
592601
"deps": {
593602
"common": [
594603
{
595-
"id": "cc 1.1.8",
604+
"id": "cc 1.1.12",
596605
"target": "cc"
597606
}
598607
],
@@ -739,6 +748,52 @@
739748
],
740749
"license_file": "LICENSE-APACHE"
741750
},
751+
"shlex 1.3.0": {
752+
"name": "shlex",
753+
"version": "1.3.0",
754+
"package_url": "https://github.com/comex/rust-shlex",
755+
"repository": {
756+
"Http": {
757+
"url": "https://static.crates.io/crates/shlex/1.3.0/download",
758+
"sha256": "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
759+
}
760+
},
761+
"targets": [
762+
{
763+
"Library": {
764+
"crate_name": "shlex",
765+
"crate_root": "src/lib.rs",
766+
"srcs": {
767+
"allow_empty": true,
768+
"include": [
769+
"**/*.rs"
770+
]
771+
}
772+
}
773+
}
774+
],
775+
"library_target_name": "shlex",
776+
"common_attrs": {
777+
"compile_data_glob": [
778+
"**"
779+
],
780+
"crate_features": {
781+
"common": [
782+
"default",
783+
"std"
784+
],
785+
"selects": {}
786+
},
787+
"edition": "2015",
788+
"version": "1.3.0"
789+
},
790+
"license": "MIT OR Apache-2.0",
791+
"license_ids": [
792+
"Apache-2.0",
793+
"MIT"
794+
],
795+
"license_file": "LICENSE-APACHE"
796+
},
742797
"strsim 0.10.0": {
743798
"name": "strsim",
744799
"version": "0.10.0",

0 commit comments

Comments
 (0)