Skip to content

Commit f71d73c

Browse files
nicocopybara-github
authored andcommitted
rust: Cherry-pick rust-lang/rust#118818
Bug: 1510456 Change-Id: I18f91669db9f28891de46c0d962e8f687cc00d09 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5110481 Reviewed-by: Hans Wennborg <hans@chromium.org> Cr-Commit-Position: refs/heads/main@{#1235782} NOKEYCHECK=True GitOrigin-RevId: c0e0fa2c7cc68f9dee81d8063a112ef88c778423
1 parent ff93179 commit f71d73c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

build_rust.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,11 @@ def main():
760760
GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
761761
'81cd7c5b11766ed1e3214a2233371fb6d72ed89c')
762762

763+
# TODO: Remove once
764+
# https://github.com/rust-lang/rust/pull/118818 has been merged.
765+
GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
766+
'a0c5079889b1f86dd9e246d8863a5c8b44fbdb78')
767+
763768
path = FetchBetaPackage('cargo', checkout_revision)
764769
if sys.platform == 'win32':
765770
cargo_bin = os.path.join(path, 'cargo', 'bin', 'cargo.exe')

0 commit comments

Comments
 (0)