Skip to content

Commit a963cd9

Browse files
aeubankscopybara-github
authored andcommitted
Change cherry-pick revision to submitted version
upload_rust bots [1] are failing due to this cherry-pick causing conflicts. Cherry-pick the final submitted revision instead. [1] https://ci.chromium.org/ui/p/chromium/builders/try/linux_upload_rust/2459/overview Change-Id: I45931ff1263936082c1b944676ccd8755850d847 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5926131 Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Arthur Eubanks <aeubanks@google.com> Cr-Commit-Position: refs/heads/main@{#1367659} NOKEYCHECK=True GitOrigin-RevId: 6bd5285e4a8222d720a795180d817dc6fb7f3f06
1 parent ac0db92 commit a963cd9

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

build_rust.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -617,11 +617,9 @@ def GitApplyCherryPicks():
617617
'8c7a7e346be4cdf13e77ab4acbfb5ade819a4e60',
618618
])
619619

620-
# TODO(b/363219692): Remove once
621-
# https://github.com/rust-lang/rust/pull/129894 or a similar fix has been
622-
# merged.
620+
# TODO: Remove once we roll past this revision.
623621
GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
624-
'f20103f9f3e35dad241dd81cd3ae9eb2dafb3f44')
622+
'edb669350a59ce48586152cf87b1d1f2841cea62')
625623

626624
print('Finished applying cherry-picks.')
627625

0 commit comments

Comments
 (0)