Skip to content

Commit 75025c2

Browse files
chbaker0Aravind Vasudevan
authored andcommitted
Roll rust [skipped clang] 7919ef0ec5776c72dace7fec1c68551a617505ad-1 : 6e0115778b0aedc90b59e035476c38e1b8c5c29b-1
https://chromium.googlesource.com/external/github.com/rust-lang/rust/+log/7919ef0ec577..6e0115778b0a Ran: tools/clang/scripts/upload_revision.py --roll-rust --clang-git-hash llvmorg-17-init-2082-g6d4a674a --clang-sub-revision 1 Bug: None Change-Id: I911e980ebdec989c042f917598a6b40e7ae9df8d Cq-Include-Trybots: luci.chromium.try:android-rust-arm-dbg Cq-Include-Trybots: luci.chromium.try:android-rust-arm-rel Cq-Include-Trybots: luci.chromium.try:linux-rust-x64-dbg Cq-Include-Trybots: luci.chromium.try:linux-rust-x64-rel Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4250343 Auto-Submit: Collin Baker <[email protected]> Commit-Queue: danakj <[email protected]> Reviewed-by: danakj <[email protected]> Cr-Commit-Position: refs/heads/main@{#1106223} NOKEYCHECK=True GitOrigin-RevId: 2e5c4436101c72e571732e77604be0bc8f38ee4c
1 parent f771d2d commit 75025c2

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

build_rust.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,10 @@
7272
# TODO(crbug.com/1347563): Re-enable when fixed.
7373
'tests/codegen/sanitizer-cfi-emit-type-checks.rs',
7474
'tests/codegen/sanitizer-cfi-emit-type-metadata-itanium-cxx-abi.rs',
75+
# Temporarily disabled due to https://github.com/rust-lang/rust/issues/45222
76+
# which appears to have regressed as of a recent LLVM update. This test is
77+
# purely performance related, not correctness.
78+
'tests/codegen/issue-45222.rs'
7579
]
7680
EXCLUDED_TESTS_WINDOWS = [
7781
# https://github.com/rust-lang/rust/issues/96464
@@ -375,11 +379,11 @@ def RunXPy(sub, args, llvm_bins_path, zlib_path, libxml2_dirs, build_mac_arm,
375379
def GetTestArgs():
376380
args = TEST_SUITES
377381
for excluded in EXCLUDED_TESTS:
378-
args.append('--skip')
382+
args.append('--exclude')
379383
args.append(excluded)
380384
if sys.platform == 'win32':
381385
for excluded in EXCLUDED_TESTS_WINDOWS:
382-
args.append('--skip')
386+
args.append('--exclude')
383387
args.append(excluded)
384388
return args
385389

update_rust.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# These fields are written by //tools/clang/scripts/upload_revision.py, and
3131
# should not be changed manually.
32-
RUST_REVISION = '7919ef0ec5776c72dace7fec1c68551a617505ad'
32+
RUST_REVISION = '6e0115778b0aedc90b59e035476c38e1b8c5c29b'
3333
RUST_SUB_REVISION = 1
3434

3535
# Trunk on 2022-10-15.
@@ -67,7 +67,7 @@
6767
# Hash of src/stage0.json, which itself contains the stage0 toolchain hashes.
6868
# We trust the Rust build system checks, but to ensure it is not tampered with
6969
# itself check the hash.
70-
STAGE0_JSON_SHA256 = '8723319ca163c78db60221fe760a8d8c9321d224036fd95bdd54f6fe3b61d676'
70+
STAGE0_JSON_SHA256 = 'b45d1f388bfe54887d5776937e05a135ec819b6d2190b8794bb87bd7072e5553'
7171

7272
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
7373
CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..'))

0 commit comments

Comments
 (0)