File tree 2 files changed +20
-2
lines changed 2 files changed +20
-2
lines changed Original file line number Diff line number Diff line change @@ -619,6 +619,24 @@ def GitApplyCherryPicks():
619
619
GitCherryPick (RUST_SRC_DIR , 'https://github.com/rust-lang/rust.git' ,
620
620
'14947b410ad23a09251180af50486e247f70b465' )
621
621
622
+ # TODO(crbug.com/350341587): Remove once
623
+ # https://github.com/rust-lang/rust/pull/127025 or a similar fix has been
624
+ # merged.
625
+ GitCherryPick (RUST_SRC_DIR , 'https://github.com/rust-lang/rust.git' ,
626
+ '56d589b5bea75d08d21d7d6efb34e8527aec7635' )
627
+
628
+ # TODO(https://crbug.com/357125724): Remove once compiler_builtins is fixed
629
+ RunCommand ([
630
+ 'git' ,
631
+ '-C' ,
632
+ RUST_SRC_DIR ,
633
+ 'revert' ,
634
+ '--no-edit' ,
635
+ '-m' ,
636
+ '1' ,
637
+ '80d8270d8488957f62fbf0df7a19dfe596be92ac' ,
638
+ ])
639
+
622
640
print ('Finished applying cherry-picks.' )
623
641
624
642
Original file line number Diff line number Diff line change 35
35
# In the case that a Rust roll fails and you want to roll Clang alone, reset
36
36
# this back to its previous value _AND_ set `OVERRIDE_CLANG_REVISION` below
37
37
# to the `CLANG_REVISION` that was in place before the roll.
38
- RUST_REVISION = '3cf924b934322fd7b514600a7dc84fc517515346 '
39
- RUST_SUB_REVISION = 4
38
+ RUST_REVISION = '595316b4006932405a63862d8fe65f71a6356293 '
39
+ RUST_SUB_REVISION = 3
40
40
41
41
# If not None, this overrides the `CLANG_REVISION` in
42
42
# //tools/clang/scripts/update.py in order to download a Rust toolchain that
You can’t perform that action at this time.
0 commit comments