[rust] Re-package to pick up a build determinism fix

zmodem · copybara-github · commit ed0fe5c0e067 · 2024-10-17T06:16:51.000-07:00
Bug: 373552119 Change-Id: I77354dc5149e79277796e92e394f881f902efd4c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5938205 Auto-Submit: Hans Wennborg <hans@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/main@{#1369955} NOKEYCHECK=True GitOrigin-RevId: d4c55f6f688eac39bf0783f69e3dcd54c75b2a8a
diff --git a/build_rust.py b/build_rust.py
@@ -609,6 +609,13 @@ def GitApplyCherryPicks():
     GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
                   'edb669350a59ce48586152cf87b1d1f2841cea62')
 
+    # TODO(crbug.com/373552119): Remove once
+    # https://github.com/rust-lang/rust/pull/131805 lands and we roll past it.
+    GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
+                  '6de277c03922fd67ad5d13daa9325357e7a02ac7')
+    GitCherryPick(RUST_SRC_DIR, 'https://github.com/rust-lang/rust.git',
+                  '18bbf5f118e721477fec1cde3c11d3fd2faebcd3')
+
     print('Finished applying cherry-picks.')
 
 
diff --git a/update_rust.py b/update_rust.py
@@ -32,7 +32,7 @@
 # These fields are written by //tools/clang/scripts/upload_revision.py, and
 # should not be changed manually.
 RUST_REVISION = 'eb4e2346748e1760f74fcaa27b42431e0b95f8f3'
-RUST_SUB_REVISION = 1
+RUST_SUB_REVISION = 2
 
 # The revision of Crubit to use from https://github.com/google/crubit
 #

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`# These fields are written by //tools/clang/scripts/upload_revision.py, and`
`33`	`33`	`# should not be changed manually.`
`34`	`34`	`RUST_REVISION = 'eb4e2346748e1760f74fcaa27b42431e0b95f8f3'`
`35`		`-RUST_SUB_REVISION = 1`
	`35`	`+RUST_SUB_REVISION = 2`
`36`	`36`
`37`	`37`	`# The revision of Crubit to use from https://github.com/google/crubit`
`38`	`38`	`#`