Bug 1797419 - Update builders to rustc 1.66. r=firefox-build-system-reviewers,ahochheiden

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

build/build-rust/workaround-bug1797441.patch

@@ -0,0 +1,60 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index dab69341..b6c864b0 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -511,10 +511,6 @@ name = "cfg-if"
+ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+-dependencies = [
+- "compiler_builtins",
+- "rustc-std-workspace-core",
+-]
+ 
+ [[package]]
+ name = "chalk-derive"
+@@ -4673,7 +4669,7 @@ version = "0.0.0"
+ dependencies = [
+  "addr2line 0.16.0",
+  "alloc",
+- "cfg-if 1.0.0",
++ "cfg-if 0.1.10",
+  "compiler_builtins",
+  "core",
+  "dlmalloc",
+@@ -4697,7 +4693,7 @@ dependencies = [
+ name = "std_detect"
+ version = "0.1.5"
+ dependencies = [
+- "cfg-if 1.0.0",
++ "cfg-if 0.1.10",
+  "compiler_builtins",
+  "libc",
+  "rustc-std-workspace-alloc",
+diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
+index bc10b12e..dad1c7ce 100644
+--- a/library/std/Cargo.toml
++++ b/library/std/Cargo.toml
+@@ -11,7 +11,7 @@ crate-type = ["dylib", "rlib"]
+ 
+ [dependencies]
+ alloc = { path = "../alloc" }
+-cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }
++cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] }
+ panic_unwind = { path = "../panic_unwind", optional = true }
+ panic_abort = { path = "../panic_abort" }
+ core = { path = "../core" }
+Submodule library/stdarch contains modified content
+diff --git a/library/stdarch/crates/std_detect/Cargo.toml b/library/stdarch/crates/std_detect/Cargo.toml
+index 3a48256..d021cbc 100644
+--- a/library/stdarch/crates/std_detect/Cargo.toml
++++ b/library/stdarch/crates/std_detect/Cargo.toml
+@@ -22,7 +22,7 @@ maintenance = { status = "experimental" }
+ 
+ [dependencies]
+ libc = { version = "0.2", optional = true, default-features = false }
+-cfg-if = "1.0.0"
++cfg-if = "0.1"
+ 
+ # When built as part of libstd
+ core = { version = "1.0.0", optional = true, package = "rustc-std-workspace-core" }

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

@@ -134,9 +134,13 @@ Here are the Rust versions for each Firefox version.
 | Firefox 105 | Rust 1.63.0 | 1.61.0 | 2022 August 11 | 2022 August 18 | 2022 September 20
 | Firefox 106 | Rust 1.63.0 | 1.61.0 | 2022 August 11 | 2022 September 15 | 2022 October 18
 | Firefox 107 | Rust 1.64.0 | 1.61.0 | 2022 September 22 | 2022 October 13 | 2022 November 15
-| **Estimated** |
 | Firefox 108 | Rust 1.65.0 | 1.63.0 | 2022 November 3 | 2022 November 10 | 2022 December 13
-| Firefox 109 | Rust 1.65.0 | ? | 2022 November 3 | 2022 December 8 | 2023 January 17
+| Firefox 109 | Rust 1.65.0 | 1.63.0 | 2022 November 3 | 2022 December 8 | 2023 January 17
+| **Estimated** |
 | Firefox 110 | Rust 1.66.0 | ? | 2022 December 15 | 2023 January 5 | 2023 February 14
 | Firefox 111 | Rust 1.67.0 | ? | 2022 January 26 | 2023 February 9 | 2023 March 14
 | Firefox 112 | Rust 1.67.0 | ? | 2022 January 26 | 2023 March 9 | 2023 April 11
+| 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

taskcluster/ci/fetch/toolchains.yml

@@ -386,13 +386,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.65.0:
+rust-1.66.0:
-    description: Rust 1.65.0 source code
+    description: Rust 1.66.0 source code
     fetch:
         type: git
         include-dot-git: true
         repo: https://github.com/rust-lang/rust/
-        revision: d939e5a3e5eb34dd1e828b9ad244ee6e6a0a989b
+        revision: 69f9c33d71c871fc16ac445211281c6e7a340943
 
 wasi-sdk:
     description: wasi-sdk-16 source code

taskcluster/ci/searchfox/kind.yml

@@ -54,7 +54,7 @@ jobs:
                 - linux64-clang
                 - linux64-nasm
                 - linux64-node
-                - linux64-rust-nightly
+                - linux64-rust-beta
                 - linux64-cbindgen
                 - linux64-dump_syms
                 - linux64-pkgconf
@@ -93,7 +93,7 @@ jobs:
                 - linux64-libdmg
                 - linux64-nasm
                 - linux64-node
-                - linux64-rust-cross-nightly
+                - linux64-rust-cross-beta
                 - linux64-cbindgen
                 - linux64-dump_syms
                 - macosx64-sdk
@@ -133,7 +133,7 @@ jobs:
             toolchain:
                 - linux64-binutils
                 - linux64-clang
-                - linux64-rust-cross-nightly
+                - linux64-rust-cross-beta
                 - linux64-rust-size
                 - linux64-nasm
                 - linux64-node
@@ -183,7 +183,7 @@ jobs:
                 - android-sdk-linux
                 - linux64-jdk
                 - linux64-clang
-                - linux64-rust-cross-nightly
+                - linux64-rust-cross-beta
                 - linux64-rust-size
                 - linux64-cbindgen
                 - linux64-dump_syms

taskcluster/ci/toolchain/dump-syms.yml

@@ -24,7 +24,7 @@ linux64-dump_syms:
         toolchain:
             - linux64-binutils
             - linux64-clang-toolchain
-            - linux64-rust-1.65
+            - linux64-rust-1.66
             - sysroot-x86_64-linux-gnu
 
 macosx64-dump_syms:
@@ -36,7 +36,7 @@ macosx64-dump_syms:
         toolchain-artifact: public/build/dump_syms.tar.zst
     fetches:
         toolchain:
-            - linux64-rust-macos-1.65
+            - linux64-rust-macos-1.66
             - linux64-clang-toolchain
             - linux64-cctools-port
             - macosx64-sdk
@@ -50,7 +50,7 @@ macosx64-aarch64-dump_syms:
         toolchain-artifact: public/build/dump_syms.tar.zst
     fetches:
         toolchain:
-            - linux64-rust-macos-1.65
+            - linux64-rust-macos-1.66
             - linux64-clang-toolchain
             - linux64-cctools-port
             - macosx64-sdk
@@ -63,5 +63,5 @@ win64-dump_syms:
         toolchain-artifact: public/build/dump_syms.tar.zst
     fetches:
         toolchain:
-            - win64-rust-1.65
+            - win64-rust-1.66
             - win64-vs2017

taskcluster/ci/toolchain/rust.yml

@@ -38,12 +38,12 @@ linux64-rust-1.63:
         ]
         toolchain-alias: linux64-rust-base
 
-linux64-rust-1.65:
+linux64-rust-1.66:
     treeherder:
         symbol: TL(rust)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -56,12 +56,12 @@ linux64-rust-1.65:
         toolchain:
             - linux64-clang-toolchain
 
-linux64-rust-nightly:
+linux64-rust-beta:
     treeherder:
-        symbol: TL(rust-nightly)
+        symbol: TL(rust-beta)
     run:
         arguments: [
-            '--channel', 'nightly-2022-11-22',
+            '--channel', 'beta-2022-12-14',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -84,24 +84,25 @@ linux64-rust-dev:
         arguments: [
             '--patch', 'rust-vendor-std.patch',
             '--patch', 'src/tools/cargo:cargo-vendor-std.patch',
+            '--patch', 'workaround-bug1797441.patch',
             '--channel', 'dev',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
         ]
     fetches:
         fetch:
-            - rust-1.65.0
+            - rust-1.66.0
         toolchain:
             - linux64-clang-toolchain
             - linux64-binutils
 
-linux64-rust-cross-1.65:
+linux64-rust-cross-1.66:
     description: "rust repack with macos and windows cross support"
     treeherder:
         symbol: TL(rust-cross)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -118,13 +119,13 @@ linux64-rust-cross-1.65:
         ]
         toolchain-alias: linux64-rust-cross
 
-linux64-rust-cross-nightly:
+linux64-rust-cross-beta:
-    description: "rust nightly repack with macos and windows cross support"
+    description: "rust beta repack with macos and windows cross support"
     treeherder:
-        symbol: TL(rust-cross-nightly)
+        symbol: TL(rust-cross-beta)
     run:
         arguments: [
-            '--channel', 'nightly-2022-11-22',
+            '--channel', 'beta-2022-12-14',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -140,13 +141,13 @@ linux64-rust-cross-nightly:
             '--target', 'x86_64-linux-android',
         ]
 
-linux64-rust-static-1.65:
+linux64-rust-static-1.66:
     description: "rust repack with static linking support"
     treeherder:
         symbol: TL(rust-static)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'aarch64-unknown-linux-musl',
             '--target', 'x86_64-unknown-linux-gnu',
@@ -170,13 +171,13 @@ linux64-rust-macos-1.61:
         ]
         toolchain-alias: linux64-rust-macos-toolchain
 
-linux64-rust-macos-1.65:
+linux64-rust-macos-1.66:
     description: "rust repack with macos-cross support"
     treeherder:
         symbol: TL(rust-macos)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -184,13 +185,13 @@ linux64-rust-macos-1.65:
         ]
         toolchain-alias: linux64-rust-macos
 
-linux64-rust-android-1.65:
+linux64-rust-android-1.66:
     description: "rust repack with android-cross support"
     treeherder:
         symbol: TL(rust-android)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
@@ -219,13 +220,13 @@ linux64-rust-windows-1.61:
         ]
         toolchain-alias: linux64-rust-windows-toolchain
 
-linux64-rust-windows-1.65:
+linux64-rust-windows-1.66:
     description: "rust repack with windows-cross support"
     treeherder:
         symbol: TL(rust-win)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-pc-windows-msvc',
@@ -247,12 +248,12 @@ win64-rust-1.61:
         ]
         toolchain-alias: win64-rust-toolchain
 
-win64-rust-1.65:
+win64-rust-1.66:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
@@ -260,23 +261,23 @@ win64-rust-1.65:
         ]
         toolchain-alias: win64-rust
 
-macosx64-rust-1.65:
+macosx64-rust-1.66:
     treeherder:
         symbol: TM(rust)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-apple-darwin',
             '--target', 'x86_64-apple-darwin',
         ]
         toolchain-alias: macosx64-rust
 
-mingw32-rust-1.65:
+mingw32-rust-1.66:
     treeherder:
         symbol: TMW(rust)
     run:
         arguments: [
-            '--channel', '1.65.0',
+            '--channel', '1.66.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',