Skip to content

Commit 1386275

Browse files
afq984Chromeos LUCI
afq984
authored and
Chromeos LUCI
committed
bazel: Bump Rust to 1.72.1
This aligns with ChromeOS Rust. Also update rules_rust to latest release to pick up bazelbuild/rules_rust@aa4b3a8 Which includes bazelbuild/rules_rust@4bd44d0 for __rust_no_alloc_shim_is_unstable which is required since Rust 1.71.0 as described in rust-lang/rust#73632 (comment) BUG=None TEST=cop Change-Id: Ib579ee725f0adc233021fb07ba55046930f71f9c Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/5095413 Tested-by: [email protected] <[email protected]> Reviewed-by: Chih-Yang Hsia <[email protected]> Commit-Queue: Li-Yu Yu <[email protected]>
1 parent f5c5df4 commit 1386275

File tree

2 files changed

+109
-20
lines changed

2 files changed

+109
-20
lines changed

‎Cargo.Bazel.lock

Lines changed: 105 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"checksum": "63e3cea27dda5cc0bb56d46c67cc75a63fd6a7bdfedfdf19943b809877c8eae6",
2+
"checksum": "349b87f9420ce830dc2b46ab2d363ee3c76639f5746cba81b832ce06f05d21e4",
33
"crates": {
44
"aho-corasick 0.7.20": {
55
"name": "aho-corasick",
@@ -446,7 +446,16 @@
446446
"build_script_attrs": {
447447
"data_glob": [
448448
"**"
449-
]
449+
],
450+
"link_deps": {
451+
"common": [
452+
{
453+
"id": "clang-sys 1.6.1",
454+
"target": "clang_sys"
455+
}
456+
],
457+
"selects": {}
458+
}
450459
},
451460
"license": "BSD-3-Clause"
452461
},
@@ -4085,7 +4094,7 @@
40854094
"data_glob": [
40864095
"**"
40874096
],
4088-
"deps": {
4097+
"link_deps": {
40894098
"common": [
40904099
{
40914100
"id": "openssl-sys 0.9.87",
@@ -6363,6 +6372,15 @@
63636372
}
63646373
},
63656374
"edition": "2021",
6375+
"proc_macro_deps": {
6376+
"common": [
6377+
{
6378+
"id": "time-macros 0.2.8",
6379+
"target": "time_macros"
6380+
}
6381+
],
6382+
"selects": {}
6383+
},
63666384
"version": "0.3.20"
63676385
},
63686386
"license": "MIT OR Apache-2.0"
@@ -8105,11 +8123,38 @@
81058123
"rock 0.1.0": "rock"
81068124
},
81078125
"conditions": {
8126+
"aarch64-apple-darwin": [
8127+
"aarch64-apple-darwin"
8128+
],
8129+
"aarch64-apple-ios": [
8130+
"aarch64-apple-ios"
8131+
],
8132+
"aarch64-apple-ios-sim": [
8133+
"aarch64-apple-ios-sim"
8134+
],
8135+
"aarch64-fuchsia": [
8136+
"aarch64-fuchsia"
8137+
],
8138+
"aarch64-linux-android": [
8139+
"aarch64-linux-android"
8140+
],
81088141
"aarch64-pc-windows-gnullvm": [],
81098142
"aarch64-pc-windows-msvc": [
81108143
"aarch64-pc-windows-msvc"
81118144
],
8145+
"aarch64-unknown-linux-gnu": [
8146+
"aarch64-unknown-linux-gnu"
8147+
],
81128148
"aarch64-uwp-windows-msvc": [],
8149+
"arm-unknown-linux-gnueabi": [
8150+
"arm-unknown-linux-gnueabi"
8151+
],
8152+
"armv7-linux-androideabi": [
8153+
"armv7-linux-androideabi"
8154+
],
8155+
"armv7-unknown-linux-gnueabi": [
8156+
"armv7-unknown-linux-gnueabi"
8157+
],
81138158
"cfg(all(any(target_os = \"android\", target_os = \"linux\"), any(rustix_use_libc, miri, not(all(target_os = \"linux\", any(target_arch = \"x86\", all(target_arch = \"x86_64\", target_pointer_width = \"64\"), all(target_endian = \"little\", any(target_arch = \"arm\", all(target_arch = \"aarch64\", target_pointer_width = \"64\"), target_arch = \"powerpc64\", target_arch = \"riscv64\", target_arch = \"mips\", target_arch = \"mips64\"))))))))": [
81148159
"aarch64-linux-android",
81158160
"armv7-linux-androideabi",
@@ -8423,17 +8468,74 @@
84238468
"i686-pc-windows-msvc",
84248469
"x86_64-pc-windows-msvc"
84258470
],
8471+
"i686-apple-darwin": [
8472+
"i686-apple-darwin"
8473+
],
8474+
"i686-linux-android": [
8475+
"i686-linux-android"
8476+
],
84268477
"i686-pc-windows-gnu": [],
84278478
"i686-pc-windows-msvc": [
84288479
"i686-pc-windows-msvc"
84298480
],
8481+
"i686-unknown-freebsd": [
8482+
"i686-unknown-freebsd"
8483+
],
8484+
"i686-unknown-linux-gnu": [
8485+
"i686-unknown-linux-gnu"
8486+
],
84308487
"i686-uwp-windows-gnu": [],
84318488
"i686-uwp-windows-msvc": [],
8489+
"powerpc-unknown-linux-gnu": [
8490+
"powerpc-unknown-linux-gnu"
8491+
],
8492+
"riscv32imc-unknown-none-elf": [
8493+
"riscv32imc-unknown-none-elf"
8494+
],
8495+
"riscv64gc-unknown-none-elf": [
8496+
"riscv64gc-unknown-none-elf"
8497+
],
8498+
"s390x-unknown-linux-gnu": [
8499+
"s390x-unknown-linux-gnu"
8500+
],
8501+
"thumbv7em-none-eabi": [
8502+
"thumbv7em-none-eabi"
8503+
],
8504+
"thumbv8m.main-none-eabi": [
8505+
"thumbv8m.main-none-eabi"
8506+
],
8507+
"wasm32-unknown-unknown": [
8508+
"wasm32-unknown-unknown"
8509+
],
8510+
"wasm32-wasi": [
8511+
"wasm32-wasi"
8512+
],
8513+
"x86_64-apple-darwin": [
8514+
"x86_64-apple-darwin"
8515+
],
8516+
"x86_64-apple-ios": [
8517+
"x86_64-apple-ios"
8518+
],
8519+
"x86_64-fuchsia": [
8520+
"x86_64-fuchsia"
8521+
],
8522+
"x86_64-linux-android": [
8523+
"x86_64-linux-android"
8524+
],
84328525
"x86_64-pc-windows-gnu": [],
84338526
"x86_64-pc-windows-gnullvm": [],
84348527
"x86_64-pc-windows-msvc": [
84358528
"x86_64-pc-windows-msvc"
84368529
],
8530+
"x86_64-unknown-freebsd": [
8531+
"x86_64-unknown-freebsd"
8532+
],
8533+
"x86_64-unknown-linux-gnu": [
8534+
"x86_64-unknown-linux-gnu"
8535+
],
8536+
"x86_64-unknown-none": [
8537+
"x86_64-unknown-none"
8538+
],
84378539
"x86_64-uwp-windows-gnu": [],
84388540
"x86_64-uwp-windows-msvc": []
84398541
}

‎WORKSPACE.bazel

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ fuzz_engine_repository(name = "fuzz_engine")
154154
#
155155

156156
RULES_RUST_VERSION, RULES_RUST_SHA256 = (
157-
"0.24.0",
158-
"48e715be2368d79bc174efdb12f34acfc89abd7ebfcbffbc02568fcb9ad91536",
157+
"0.32.0",
158+
"1e7114ea2af800c6987ca38daeee13e3ae6e934875b4f7ca24b798857f95431e",
159159
)
160160

161161
http_archive(
@@ -167,27 +167,14 @@ http_archive(
167167
],
168168
)
169169

170-
http_archive(
171-
name = "rust_cc_common_link",
172-
patch_args = ["-p3"],
173-
patches = ["//:third_party/rules_rust/0001-cc_common_link-Use-linkstatic-for-allocator_library.patch"],
174-
sha256 = RULES_RUST_SHA256,
175-
strip_prefix = "test/cc_common_link",
176-
urls = [
177-
"https://github.com/bazelbuild/rules_rust/releases/download/{0}/rules_rust-v{0}.tar.gz".format(RULES_RUST_VERSION),
178-
"https://storage.googleapis.com/chromeos-localmirror/distfiles/bazelbuild-rules_rust-v{0}.tar.gz".format(RULES_RUST_VERSION),
179-
],
180-
)
181-
182170
load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_register_toolchains")
183171

184172
rules_rust_dependencies()
185173

186174
rust_register_toolchains(
187-
allocator_library = "@rust_cc_common_link//:allocator_library",
188-
edition = "2018",
175+
edition = "2021",
189176
versions = [
190-
"1.69.0",
177+
"1.72.1",
191178
],
192179
)
193180

0 commit comments

Comments
 (0)