Use rust_src CIPD package for Rust toolchain build

Instead of checking out the Rust git repository and fetching all
dependencies, use the rust_src package added in crrev.com/c/3863563
which already has all dependencies.

Bug: 1245714
Change-Id: I371db4d0dfcaa774d3c08d7a4367c5f6609068ed

Cq-Include-Trybots: luci.chromium.try:android-rust-arm-dbg,android-rust-arm-rel,linux-rust-x64-dbg,linux-rust-x64-rel
Change-Id: I371db4d0dfcaa774d3c08d7a4367c5f6609068ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3867195
Reviewed-by: Hans Wennborg <hans@chromium.org>
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1047772}
NOKEYCHECK=True
GitOrigin-RevId: 1a5fb4a08915b40307a465771d7711277d10a69c

Author: chbaker0

build_rust.py

@@ -61,7 +61,7 @@
 
 RUST_GIT_URL = 'https://github.com/rust-lang/rust/'
 
-RUST_SRC_DIR = os.path.join(THIRD_PARTY_DIR, 'rust-src')
+RUST_SRC_DIR = os.path.join(THIRD_PARTY_DIR, 'rust_src', 'src')
 STAGE0_JSON_PATH = os.path.join(RUST_SRC_DIR, 'src', 'stage0.json')
 # Download crates.io dependencies to rust-src subdir (rather than $HOME/.cargo)
 CARGO_HOME_DIR = os.path.join(RUST_SRC_DIR, 'cargo-home')
@@ -110,49 +110,6 @@ def RunCommand(command, env=None, fail_hard=True):
     return False
 
 
-def CheckoutRust(commit, dir):
-    # Submodules we must update early since bootstrap wants them before it
-    # starts managing them.
-    force_update_submodules = [
-        'src/tools/rust-analyzer', 'compiler/rustc_codegen_cranelift'
-    ]
-
-    # Shared between first checkout and subsequent updates.
-    def UpdateSubmodules():
-        return RunCommand(
-            ['git', 'submodule', 'update', '--init', '--recursive'] +
-            force_update_submodules,
-            fail_hard=False)
-
-    # Try updating the current repo if it exists and has no local diff.
-    if os.path.isdir(dir):
-        os.chdir(dir)
-        # git diff-index --quiet returns success when there is no diff.
-        # Also check that the first commit is reachable.
-        if (RunCommand(['git', 'diff-index', '--quiet', 'HEAD'],
-                       fail_hard=False)
-                and RunCommand(['git', 'fetch'], fail_hard=False)
-                and RunCommand(['git', 'checkout', commit], fail_hard=False)
-                and UpdateSubmodules()):
-            return
-
-        # If we can't use the current repo, delete it.
-        os.chdir(CHROMIUM_DIR)  # Can't remove dir if we're in it.
-        print('Removing %s.' % dir)
-        RmTree(dir)
-
-    clone_cmd = ['git', 'clone', RUST_GIT_URL, dir]
-
-    if RunCommand(clone_cmd, fail_hard=False):
-        os.chdir(dir)
-        if (RunCommand(['git', 'checkout', commit], fail_hard=False)
-                and UpdateSubmodules()):
-            return
-
-    print('CheckoutRust failed.')
-    sys.exit(1)
-
-
 def VerifyStage0JsonHash():
     hasher = hashlib.sha256()
     with open(STAGE0_JSON_PATH, 'rb') as input:
@@ -243,10 +200,6 @@ def main():
         help=
         'checkout Rust, verify the stage0 hash, then quit without building. '
         'Will print the actual hash if different than expected.')
-    parser.add_argument(
-        '--skip-checkout',
-        action='store_true',
-        help='skip Rust git checkout. Useful for trying local changes')
     parser.add_argument('--skip-clean',
                         action='store_true',
                         help='skip x.py clean step')
@@ -284,9 +237,6 @@ def main():
     else:
         llvm_libs_root = build.LLVM_BOOTSTRAP_DIR
 
-    if not args.skip_checkout:
-        CheckoutRust(RUST_REVISION, RUST_SRC_DIR)
-
     VerifyStage0JsonHash()
     if args.verify_stage0_hash:
         # The above function exits and prints the actual hash if verification
@@ -313,16 +263,6 @@ def main():
     else:
         assert not rest
 
-    # Delete vendored sources and .cargo subdir. Otherwise when updating an
-    # existing checkout, vendored sources will not be re-fetched leaving deps
-    # out of date.
-    if not args.skip_checkout:
-        for dir in [
-                os.path.join(RUST_SRC_DIR, d) for d in ['vendor', '.cargo']
-        ]:
-            if os.path.exists(dir):
-                shutil.rmtree(dir)
-
     if not args.skip_clean:
         print('Cleaning build artifacts...')
         RunXPy('clean', [], args.gcc_toolchain, args.verbose)

config.toml.template

@@ -27,9 +27,7 @@ description = "$PACKAGE_VERSION chromium"
 # it fails to run under sudo even if the sudo user is not root, unless sources
 # are vendored in tree.
 locked-deps = true
-
-# TODO(crbug.com/1342708): fix vendoring and re-enable.
-vendor = false
+vendor = true
 
 target = ["x86_64-unknown-linux-gnu"]
 

update_rust.py

@@ -27,7 +27,7 @@
     os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'clang',
                  'scripts'))
 
-RUST_REVISION = 'abd4d2ef'
+RUST_REVISION = '20220914'
 RUST_SUB_REVISION = 1
 
 # Trunk on 2022-08-26.