Update Rust revision

Additionally fixes version string handling and changes the build
configuration to the nightly channel.

Bug: 1379429
Change-Id: Ia1dfcb168eff460bbf27d02c2607b97eeb7795d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3961451
Commit-Queue: Collin Baker <collinbaker@chromium.org>
Reviewed-by: Adrian Taylor <adetaylor@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1067653}
NOKEYCHECK=True
GitOrigin-RevId: 7b0c4f5b28278bb824b3aa7c213e2126b79a66a5

Author: chbaker0

build_rust.py

@@ -65,7 +65,9 @@
 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')
-RUST_SRC_VERSION_FILE_PATH = os.path.join(RUST_SRC_DIR, 'src', 'version')
+RUST_SRC_VERSION_FILE_PATH = os.path.join(RUST_SRC_DIR, 'version')
+RUST_SRC_GIT_COMMIT_INFO_FILE_PATH = os.path.join(RUST_SRC_DIR,
+                                                  'git-commit-info')
 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')
@@ -187,6 +189,18 @@ def GetTestArgs():
     return args
 
 
+def GetVersionStamp():
+    # We must generate a version stamp that contains the expected `rustc
+    # --version` output. This contains the Rust release version, git commit data
+    # that the nightly tarball was generated from, and chromium-specific package
+    # information.
+    with open(RUST_SRC_VERSION_FILE_PATH) as version_file:
+        rust_version = version_file.readline().rstrip()
+
+    return ('rustc %s (%s chromium)\n' %
+            (rust_version, GetPackageVersionForBuild()))
+
+
 def main():
     parser = argparse.ArgumentParser(
         description='Build and package Rust toolchain')
@@ -294,12 +308,8 @@ def main():
 
     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, GetPackageVersionForBuild()))
+        stamp.write(GetVersionStamp())
 
     return 0
 

config.toml.template

@@ -14,7 +14,7 @@ static-libstdcpp = true
 
 [rust]
 download-rustc = false
-channel = "dev"
+channel = "nightly"
 description = "$PACKAGE_VERSION chromium"
 
 [build]

update_rust.py

@@ -27,7 +27,7 @@
     os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'clang',
                  'scripts'))
 
-RUST_REVISION = '20220914'
+RUST_REVISION = '20221101'
 RUST_SUB_REVISION = 1
 
 # Trunk on 2022-10-15.
@@ -45,13 +45,13 @@
 # This should almost always be None. When a breakage happens the fallback should
 # be temporary. Once fixed, the applicable revision(s) above should be updated
 # and FALLBACK_CLANG_VERSION should be reset to None.
-FALLBACK_CLANG_VERSION = 'llvmorg-16-init-8697-g60809cd2-1'
+FALLBACK_CLANG_VERSION = None
 
 # 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
 # itself check the hash.
 STAGE0_JSON_SHA256 = (
-    '7ba877972bd98eed652293c16650006967326d9d86d3adae59054c7ba0c41df5')
+    'c0909797c1901c32985a40ec6b54b9ccad8464aa5dbebd20235db094fee1a6bc')
 
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..'))
@@ -90,7 +90,8 @@ def GetStampVersion():
     if os.path.exists(RUST_TOOLCHAIN_OUT_DIR):
         with open(VERSION_STAMP_PATH) as version_file:
             existing_stamp = version_file.readline().rstrip()
-        version_re = re.compile(r'rustc [0-9.]+-dev \((.+?) chromium\)')
+        version_re = re.compile(
+            r'rustc [0-9.]+-nightly \([0-9a-f -]+\) \((.+?) chromium\)')
         match = version_re.fullmatch(existing_stamp)
         if match is None:
             return None