Bug 1821227 - Update builders to rustc 1.69. r=firefox-build-system-r…

…eviewers,ahochheiden

Differential Revision: https://phabricator.services.mozilla.com/D175814

build/build-rust/cargo-vendor-std.patch

@@ -12,10 +12,10 @@ diff --git a/src/cargo/core/compiler/standard_lib.rs b/src/cargo/core/compiler/s
 index e0baebd51..547b84147 100644
 --- a/src/cargo/core/compiler/standard_lib.rs
 +++ b/src/cargo/core/compiler/standard_lib.rs
-@@ -12,6 +12,7 @@ use crate::util::errors::CargoResult;
+@@ -11,6 +11,7 @@ use crate::ops::{self, Packages};
+ use crate::util::errors::CargoResult;
  use crate::Config;
  use std::collections::{HashMap, HashSet};
- use std::env;
 +use std::fs;
  use std::path::PathBuf;
 

docs/writing-rust-code/update-policy.md

@@ -139,8 +139,8 @@ Here are the Rust versions for each Firefox version.
 | Firefox 110 | Rust 1.66.0 | 1.65.0 | 2022 December 15 | 2023 January 12 | 2023 February 14
 | Firefox 111 | Rust 1.67.0 | 1.65.0 | 2022 January 26 | 2023 February 9 | 2023 March 14
 | Firefox 112 | Rust 1.67.0 | 1.65.0 | 2022 January 26 | 2023 March 9 | 2023 April 11
+| Firefox 113 | Rust 1.68.0 | 1.65.0 | 2022 March 9 | 2023 April 6 | 2023 May 9
 | **Estimated** |
-| Firefox 113 | Rust 1.68.0 | ? | 2022 March 9 | 2023 April 6 | 2023 May 9
 | Firefox 114 | Rust 1.69.0 | ? | 2022 April 20 | 2023 May 4 | 2023 June 6
 | Firefox 115 | Rust 1.69.0 | ? | 2022 April 20 | 2023 June 1 | 2023 July 4
 | Firefox 116 | Rust 1.70.0 | ? | 2022 June 1 | 2023 June 29 | 2023 August 1

mozglue/static/rust/build.rs

@@ -16,7 +16,7 @@ fn main() {
     println!("cargo:rerun-if-changed=wrappers.cpp");
 
     let ver = version().unwrap();
-    let max_oom_hook_version = Version::parse("1.69.0-alpha").unwrap();
+    let max_oom_hook_version = Version::parse("1.70.0-alpha").unwrap();
 
     if ver < max_oom_hook_version {
         println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");

taskcluster/ci/fetch/toolchains.yml

@@ -378,13 +378,13 @@ clang-trunk:
 # We build stable rust from source so the resulting compiler acts as a nightly
 # rust compiler, allowing to use unstable features like -Zbuild-std and
 # sanitizers.
-rust-1.68.0:
-    description: Rust 1.68.0 source code
+rust-1.69.0:
+    description: Rust 1.69.0 source code
     fetch:
         type: git
         include-dot-git: true
         repo: https://github.com/rust-lang/rust/
-        revision: 2c8cc343237b8f7d5a3c3703e3a87f2eb2c54a74
+        revision: 84c898d65adf2f39a5a98507f1fe0ce10a2b8dbc
 
 wasi-sdk:
     description: wasi-sdk-16 source code

taskcluster/ci/toolchain/rust.yml

@@ -26,12 +26,12 @@ linux64-rust-1.65:
             - linux64-rust-base
             - linux64-rust-toolchain
 
-linux64-rust-1.68:
+linux64-rust-1.69:
     treeherder:
         symbol: TL(rust)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -49,7 +49,7 @@ linux64-rust-beta:
         symbol: TL(rust-beta)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -83,17 +83,17 @@ linux64-rust-dev:
         ]
     fetches:
         fetch:
-            - rust-1.68.0
+            - rust-1.69.0
         toolchain:
             - linux64-clang-toolchain
 
-linux64-rust-cross-1.68:
+linux64-rust-cross-1.69:
     description: "rust repack with macos and windows cross support"
     treeherder:
         symbol: TL(rust-cross)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -132,13 +132,13 @@ linux64-rust-cross-beta:
             '--target', 'x86_64-linux-android',
         ]
 
-linux64-rust-static-1.68:
+linux64-rust-static-1.69:
     description: "rust repack with static linking support"
     treeherder:
         symbol: TL(rust-static)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'aarch64-unknown-linux-musl',
             '--target', 'x86_64-unknown-linux-gnu',
@@ -162,27 +162,27 @@ linux64-rust-macos-1.65:
         ]
         toolchain-alias: linux64-rust-macos-toolchain
 
-linux64-rust-macos-1.68:
+linux64-rust-macos-1.69:
     description: "rust repack with macos-cross support"
     treeherder:
         symbol: TL(rust-macos)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
             '--target', 'aarch64-apple-darwin',
         ]
         toolchain-alias: linux64-rust-macos
 
-linux64-rust-android-1.68:
+linux64-rust-android-1.69:
     description: "rust repack with android-cross support"
     treeherder:
         symbol: TL(rust-android)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
@@ -211,13 +211,13 @@ linux64-rust-windows-1.65:
         ]
         toolchain-alias: linux64-rust-windows-toolchain
 
-linux64-rust-windows-1.68:
+linux64-rust-windows-1.69:
     description: "rust repack with windows-cross support"
     treeherder:
         symbol: TL(rust-win)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-pc-windows-msvc',
@@ -226,36 +226,36 @@ linux64-rust-windows-1.68:
         ]
         toolchain-alias: linux64-rust-windows
 
-win64-rust-1.68:
+win64-rust-1.69:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
             '--target', 'aarch64-pc-windows-msvc',
         ]
         toolchain-alias: win64-rust
 
-macosx64-rust-1.68:
+macosx64-rust-1.69:
     treeherder:
         symbol: TM(rust)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-apple-darwin',
             '--target', 'x86_64-apple-darwin',
         ]
         toolchain-alias: macosx64-rust
 
-mingw32-rust-1.68:
+mingw32-rust-1.69:
     treeherder:
         symbol: TMW(rust)
     run:
         arguments: [
-            '--channel', '1.68.0',
+            '--channel', '1.69.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',