Bug 1758780 - Update builders to rustc 1.60. r=firefox-build-system-reviewers,mhentges

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

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.61.0-alpha").unwrap();
+    let max_oom_hook_version = Version::parse("1.62.0-alpha").unwrap();
 
     if ver < max_oom_hook_version {
         println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");

taskcluster/ci/fetch/toolchains.yml

@@ -368,22 +368,22 @@ clang-trunk:
         repo: https://github.com/llvm/llvm-project
         branch: main
 
-# This revision currently corresponds to rust nightly-2022-01-09,
-# which is the first nightly with the version 1.60.0,
+# This revision currently corresponds to rust nightly-2022-02-20,
+# which is the first nightly with the version 1.61.0,
 # so it should be as close as possible to the behaviour of
-# stable-1.59.0.
+# stable-1.60.0.
 #
 # We use this to build from source, so the resulting non-official
-# artifacts will report their version as "1.60.0-dev", but will otherwise
+# artifacts will report their version as "1.61.0-dev", but will otherwise
 # behave like a nightly build. This means they will allow you to use
 # unstable features like -Zbuild-std and sanitizers.
-rust-1.60.0-dev:
-    description: Rust 1.60.0-dev source code
+rust-1.61.0-dev:
+    description: Rust 1.61.0-dev source code
     fetch:
         type: git
         include-dot-git: true
         repo: https://github.com/rust-lang/rust/
-        revision: a7e2e33960e95d2eb1a2a2aeec169dba5f73de05
+        revision: 3b348d932aa5c9884310d025cf7c516023fd0d9a
 
 wasi-sdk:
     description: wasi-sdk source code

taskcluster/ci/toolchain/rust.yml

@@ -47,7 +47,7 @@ linux64-rust-1.57:
 
 linux64-rust-1.59:
     treeherder:
-        symbol: TL(rust)
+        symbol: TL(rust-1.59)
     run:
         arguments: [
             '--channel', '1.59.0',
@@ -58,6 +58,23 @@ linux64-rust-1.59:
             '--target', 'wasm32-wasi',
             '--compiler-builtins-hack',
         ]
+    fetches:
+        toolchain:
+            - linux64-clang-toolchain
+
+linux64-rust-1.60:
+    treeherder:
+        symbol: TL(rust)
+    run:
+        arguments: [
+            '--channel', '1.60.0',
+            '--host', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-unknown-linux-gnu',
+            '--target', 'i686-unknown-linux-gnu',
+            '--target', 'aarch64-unknown-linux-gnu',
+            '--target', 'wasm32-wasi',
+            '--compiler-builtins-hack',
+        ]
         toolchain-alias: linux64-rust
     fetches:
         toolchain:
@@ -81,19 +98,19 @@ linux64-rust-dev:
         ]
     fetches:
         fetch:
-            - rust-1.60.0-dev
+            - rust-1.61.0-dev
         toolchain:
             - linux64-clang-toolchain
             - linux64-binutils
 
 
-linux64-rust-cross-1.59:
+linux64-rust-cross-1.60:
     description: "rust repack with macos and windows cross support"
     treeherder:
         symbol: TL(rust-cross)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -110,13 +127,13 @@ linux64-rust-cross-1.59:
         ]
         toolchain-alias: linux64-rust-cross
 
-linux64-rust-static-1.59:
+linux64-rust-static-1.60:
     description: "rust repack with static linking support"
     treeherder:
         symbol: TL(rust-static)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-musl',
@@ -138,13 +155,13 @@ linux64-rust-macos-1.57:
             '--target', 'aarch64-apple-darwin',
         ]
 
-linux64-rust-macos-1.59:
+linux64-rust-macos-1.60:
     description: "rust repack with macos-cross support"
     treeherder:
-        symbol: TL(rust-macos-1.59)
+        symbol: TL(rust-macos-1.60)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -152,13 +169,13 @@ linux64-rust-macos-1.59:
         ]
         toolchain-alias: linux64-rust-macos
 
-linux64-rust-android-1.59:
+linux64-rust-android-1.60:
     description: "rust repack with android-cross support"
     treeherder:
         symbol: TL(rust-android)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
@@ -186,13 +203,13 @@ linux64-rust-windows-1.57:
             '--target', 'i686-pc-windows-msvc',
         ]
 
-linux64-rust-windows-1.59:
+linux64-rust-windows-1.60:
     description: "rust repack with windows-cross support"
     treeherder:
         symbol: TL(rust-win)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-pc-windows-msvc',
@@ -212,12 +229,12 @@ win64-rust-1.57:
             '--target', 'aarch64-pc-windows-msvc',
         ]
 
-win64-rust-1.59:
+win64-rust-1.60:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
@@ -225,23 +242,23 @@ win64-rust-1.59:
         ]
         toolchain-alias: win64-rust
 
-macosx64-rust-1.59:
+macosx64-rust-1.60:
     treeherder:
         symbol: TM(rust)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-apple-darwin',
             '--target', 'x86_64-apple-darwin',
         ]
         toolchain-alias: macosx64-rust
 
-mingw32-rust-1.59:
+mingw32-rust-1.60:
     treeherder:
         symbol: TMW(rust)
     run:
         arguments: [
-            '--channel', '1.59.0',
+            '--channel', '1.60.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',