Update Rust revision, include src, and disable bad test

Rolls a new Rust toolchain with the following changes in addition to
updating the revision:

With rust-lang/rust#96493, disables test
src/test/ui/numeric/numeric-cast.rs (which fails on our CI due to bug
rust-lang/rust#94322) and re-enables the rest
of the src/test/ui suite.

Includes Rust std sources and vendored dependencies in the package at
third_party/rust-toolchain/lib/rustlib/src/rust/

Fixed: 1320459
Change-Id: I6b25be163214c4408123f3abb7e0135e94ec642e

Cq-Include-Trybots: luci.chromium.try:linux-rust-x64-rel,linux-rust-x64-dbg
Change-Id: I6b25be163214c4408123f3abb7e0135e94ec642e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3635438
Commit-Queue: Collin Baker <[email protected]>
Reviewed-by: Adrian Taylor <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1003924}
NOKEYCHECK=True
GitOrigin-RevId: a6e76db0e266a58447df055c9d77950a78d16380

Author: chbaker0

build_rust.py

@@ -66,23 +66,31 @@
 CARGO_HOME_DIR = os.path.join(RUST_SRC_DIR, 'cargo-home')
 RUST_SRC_VERSION_FILE_PATH = os.path.join(RUST_SRC_DIR, 'src', 'version')
 RUST_TOOLCHAIN_LIB_DIR = os.path.join(RUST_TOOLCHAIN_OUT_DIR, 'lib')
+RUST_TOOLCHAIN_SRC_DIST_DIR = os.path.join(RUST_TOOLCHAIN_LIB_DIR, 'rustlib',
+                                           'src', 'rust')
+RUST_TOOLCHAIN_SRC_DIST_VENDOR_DIR = os.path.join(RUST_TOOLCHAIN_SRC_DIST_DIR,
+                                                  'vendor')
 VERSION_STAMP_PATH = os.path.join(RUST_TOOLCHAIN_OUT_DIR, 'VERSION')
 RUST_CONFIG_TEMPLATE_PATH = os.path.join(
     os.path.dirname(os.path.abspath(__file__)), 'config.toml.template')
+RUST_SRC_VENDOR_DIR = os.path.join(RUST_SRC_DIR, 'vendor')
 
 # Desired tools and libraries in our Rust toolchain.
 DISTRIBUTION_ARTIFACTS = [
     'cargo', 'clippy', 'compiler/rustc', 'library/std', 'rust-analyzer',
-    'rustfmt'
+    'rustfmt', 'src'
 ]
 
 # Which test suites to run. Any failure will fail the build.
 TEST_SUITES = [
     'library/std',
     'src/test/codegen',
+    'src/test/ui',
+]
 
+EXCLUDED_TESTS = [
     # Temporarily disabled due to https://github.com/rust-lang/rust/issues/94322
-    # 'src/test/ui',
+    'src/test/ui/numeric/numeric-cast.rs',
 ]
 
 
@@ -206,6 +214,15 @@ def RunXPy(sub, args, gcc_toolchain_path, verbose):
   RunCommand(cmd + args, env=RUSTENV)
 
 
+# Get arguments to run desired test suites, minus disabled tests.
+def GetTestArgs():
+  args = TEST_SUITES
+  for excluded in EXCLUDED_TESTS:
+    args.append('--skip')
+    args.append(excluded)
+  return args
+
+
 def main():
   parser = argparse.ArgumentParser(
       description='Build and package Rust toolchain')
@@ -302,7 +319,7 @@ def main():
   if not args.skip_test:
     print('Running stage 2 tests...')
     # Run a subset of tests. Tell x.py to keep the rustc we already built.
-    RunXPy('test', TEST_SUITES, args.gcc_toolchain, args.verbose)
+    RunXPy('test', GetTestArgs(), args.gcc_toolchain, args.verbose)
 
   targets = [
       'library/proc_macro', 'library/std', 'src/tools/cargo',
@@ -314,22 +331,28 @@ def main():
   print('Building stage 2 artifacts...')
   RunXPy('build', ['--stage', '2'] + targets, args.gcc_toolchain, args.verbose)
 
-  if not args.skip_install:
-    print(f'Installing to {RUST_TOOLCHAIN_OUT_DIR} ...')
-    # Clean output directory.
-    if os.path.exists(RUST_TOOLCHAIN_OUT_DIR):
-      shutil.rmtree(RUST_TOOLCHAIN_OUT_DIR)
+  if args.skip_install:
+    # Rust is fully built. We can quit.
+    return 0
+
+  print(f'Installing to {RUST_TOOLCHAIN_OUT_DIR} ...')
+  # Clean output directory.
+  if os.path.exists(RUST_TOOLCHAIN_OUT_DIR):
+    shutil.rmtree(RUST_TOOLCHAIN_OUT_DIR)
 
-    RunXPy('install', DISTRIBUTION_ARTIFACTS, args.gcc_toolchain, args.verbose)
+  RunXPy('install', DISTRIBUTION_ARTIFACTS, args.gcc_toolchain, args.verbose)
 
-    # Write expected `rustc --version` string to our toolchain directory.
-    with open(RUST_SRC_VERSION_FILE_PATH) as version_file:
-      rust_version = version_file.readline().rstrip()
-    with open(VERSION_STAMP_PATH, 'w') as stamp:
-      stamp.write('rustc %s-dev (%s chromium)\n' %
-                  (rust_version, GetPackageVersion()))
+  # Write expected `rustc --version` string to our toolchain directory.
+  with open(RUST_SRC_VERSION_FILE_PATH) as version_file:
+    rust_version = version_file.readline().rstrip()
+  with open(VERSION_STAMP_PATH, 'w') as stamp:
+    stamp.write('rustc %s-dev (%s chromium)\n' %
+                (rust_version, GetPackageVersion()))
 
-  return 0
+  # x.py installed library sources to our toolchain directory. We also need to
+  # copy the vendor directory so Chromium checkouts have all the deps needed to
+  # build std.
+  shutil.copytree(RUST_SRC_VENDOR_DIR, RUST_TOOLCHAIN_SRC_DIST_VENDOR_DIR)
 
 
 if __name__ == '__main__':

update_rust.py

@@ -13,6 +13,7 @@
 
 import argparse
 import os
+import shutil
 import sys
 import tempfile
 import urllib
@@ -25,8 +26,8 @@
     os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'clang',
                  'scripts'))
 
-RUST_REVISION = '1f631e8e'
-RUST_SUB_REVISION = 2
+RUST_REVISION = 'f001f930'
+RUST_SUB_REVISION = 1
 
 # Hash of src/stage0.json, which itself contains the stage0 toolchain hashes.
 # We trust the Rust build system checks, but to ensure it is not tampered with
@@ -69,10 +70,15 @@ def main():
   from update import (DownloadAndUnpack, GetDefaultHostOs, GetPlatformUrlPrefix)
 
   try:
-    with tempfile.TemporaryFile() as f:
+    with tempfile.TemporaryDirectory() as tdir:
       url = '%srust-toolchain-%s.tgz' % (GetPlatformUrlPrefix(
           GetDefaultHostOs()), GetPackageVersion())
-      DownloadAndUnpack(url, THIRD_PARTY_DIR)
+      DownloadAndUnpack(url, tdir)
+
+      # If download was successful, swap out existing rust-toolchain dir with
+      # newly extracted one.
+      shutil.rmtree(RUST_TOOLCHAIN_OUT_DIR)
+      shutil.move(os.path.join(tdir, 'rust-toolchain'), RUST_TOOLCHAIN_OUT_DIR)
   except urllib.error.HTTPError as e:
     # Fail softly for now. This can happen if a Rust package was not produced,
     # e.g. if the Rust build failed upon a Clang update, or if a Rust roll and