Roll rust c0583a0221c28f01a7bdbc01464baf22f7c6d4a8-1 : 36aab8df0ab8a76f1c4f95ce8becefdd8a6fe526-1
https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/c0583a0221c2..36aab8df0ab8
Ran: tools/clang/scripts/upload_revision.py --rust-git-hash=36aab8df0ab8a76f1c4f95ce8becefdd8a6fe526
Bug: 1489202
Change-Id: I0a004113e21dfda3f262b060083df5a79de2c1f5
Disable-Rts: True
Cq-Include-Trybots: chromium/try:chromeos-amd64-generic-cfi-thin-lto-rel
Cq-Include-Trybots: chromium/try:dawn-win10-x86-deps-rel
Cq-Include-Trybots: chromium/try:lacros-arm64-generic-rel
Cq-Include-Trybots: chromium/try:linux_chromium_cfi_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_chromeos_msan_rel_ng
Cq-Include-Trybots: chromium/try:linux_chromium_msan_rel_ng
Cq-Include-Trybots: chromium/try:mac11-arm64-rel,mac_chromium_asan_rel_ng
Cq-Include-Trybots: chromium/try:ios-catalyst
Cq-Include-Trybots: chromium/try:win-asan
Cq-Include-Trybots: chromium/try:fuchsia-official
Cq-Include-Trybots: chromium/try:mac-official,linux-official
Cq-Include-Trybots: chromium/try:win-official,win32-official
Cq-Include-Trybots: chromium/try:linux-swangle-try-x64,win-swangle-try-x86
Cq-Include-Trybots: chrome/try:iphone-device,ipad-device
Cq-Include-Trybots: chrome/try:linux-chromeos-chrome
Cq-Include-Trybots: chrome/try:win-chrome,win64-chrome,linux-chrome,mac-chrome
Cq-Include-Trybots: chrome/try:linux-pgo,mac-pgo,win32-pgo,win64-pgo
Cq-Include-Trybots: chromium/try:android-rust-arm32-rel
Cq-Include-Trybots: chromium/try:android-rust-arm64-dbg
Cq-Include-Trybots: chromium/try:android-rust-arm64-rel
Cq-Include-Trybots: chromium/try:linux-rust-x64-dbg
Cq-Include-Trybots: chromium/try:linux-rust-x64-rel
Cq-Include-Trybots: chromium/try:mac-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-dbg
Cq-Include-Trybots: chromium/try:win-rust-x64-rel
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4905409
Commit-Queue: Hans Wennborg <hans@chromium.org>
Reviewed-by: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1205679}
NOKEYCHECK=True
GitOrigin-RevId: b52596153ac1347e7d710803cc45e57ca8331b98
diff --git a/build_rust.py b/build_rust.py
index be37f58..cec533f 100755
--- a/build_rust.py
+++ b/build_rust.py
@@ -748,10 +748,6 @@
if not args.skip_checkout:
CheckoutGitRepo('Rust', RUST_GIT_URL, checkout_revision, RUST_SRC_DIR)
- # Cherry-picks: for LLVM API changes:
- # llvm-wrapper: adapt for LLVM API change
- GitCherryPick(RUST_SRC_DIR, 'af401b0ca366edd7d0df061b7a635c06e6481f18')
-
path = FetchBetaPackage('cargo', checkout_revision)
if sys.platform == 'win32':
cargo_bin = os.path.join(path, 'cargo', 'bin', 'cargo.exe')
diff --git a/update_rust.py b/update_rust.py
index 0e81553..f766bb2 100755
--- a/update_rust.py
+++ b/update_rust.py
@@ -36,7 +36,7 @@
# In the case that a Rust roll fails and you want to roll Clang alone, reset
# this back to its previous value _AND_ set `OVERRIDE_CLANG_REVISION` below
# to the `CLANG_REVISION` that was in place before the roll.
-RUST_REVISION = 'c0583a0221c28f01a7bdbc01464baf22f7c6d4a8'
+RUST_REVISION = '36aab8df0ab8a76f1c4f95ce8becefdd8a6fe526'
RUST_SUB_REVISION = 1
# If not None, this overrides the `CLANG_REVISION` in