From a1f8916fd36104d85c9a203ba6cda7b94a970e91 Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Mon, 8 Jan 2018 09:05:31 -0800
Subject: [PATCH] Bug 1418081 - Update builders to rust 1.23.0. r=ted

New upstream release.

- Avoiding argument copies improves memory footprint.
- RwLock<T> no longer requires T to be Send.
- AsciiExt trait methods are now directly available
  on str, [u8], u8, and char types without a `use`
  statement.

MozReview-Commit-ID: 7Rx8uoNTMqH

--HG--
extra : rebase_source : 39d6297d61d19d710a1376557e4b4d81bdab02c9
---
 taskcluster/ci/toolchain/linux.yml   | 36 +++++++++++++++++++++++-----
 taskcluster/ci/toolchain/windows.yml | 12 +++++-----
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml
index 9e54af2c0c5e..1e67eb054af5 100755
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -333,7 +333,7 @@ linux64-android-gradle-dependencies:
         - linux64-android-sdk-linux-repack
         - linux64-proguard-jar-repack
 
-linux64-rust-1.22:
+linux64-rust-1.23:
     description: "rust repack"
     treeherder:
         kind: build
@@ -349,7 +349,7 @@ linux64-rust-1.22:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.22.1',
+            '--channel', '1.23.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -357,6 +357,30 @@ linux64-rust-1.22:
         toolchain-alias: linux64-rust
         toolchain-artifact: public/build/rustc.tar.xz
 
+linux64-rust-1.22:
+    description: "rust repack"
+    treeherder:
+        kind: build
+        platform: toolchains/opt
+        symbol: TL(rust-1.22)
+        tier: 1
+    worker-type: aws-provisioner-v1/gecko-{level}-b-linux
+    worker:
+        docker-image: {in-tree: desktop-build}
+        max-run-time: 7200
+        env:
+            UPLOAD_DIR: artifacts
+    run:
+        using: toolchain-script
+        script: repack_rust.py
+        arguments: [
+            '--channel', '1.22.1',
+            '--host', 'x86_64-unknown-linux-gnu',
+            '--target', 'x86_64-unknown-linux-gnu',
+            '--target', 'i686-unknown-linux-gnu',
+        ]
+        toolchain-artifact: public/build/rustc.tar.xz
+
 linux64-rust-1.19:
     description: "rust repack"
     treeherder:
@@ -380,7 +404,7 @@ linux64-rust-1.19:
         ]
         toolchain-artifact: public/build/rustc.tar.xz
 
-linux64-rust-macos-1.22:
+linux64-rust-macos-1.23:
     description: "rust repack with macos-cross support"
     treeherder:
         kind: build
@@ -396,7 +420,7 @@ linux64-rust-macos-1.22:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.22.1',
+            '--channel', '1.23.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -404,7 +428,7 @@ linux64-rust-macos-1.22:
         toolchain-alias: linux64-rust-macos
         toolchain-artifact: public/build/rustc.tar.xz
 
-linux64-rust-android-1.22:
+linux64-rust-android-1.23:
     description: "rust repack with android-cross support"
     treeherder:
         kind: build
@@ -420,7 +444,7 @@ linux64-rust-android-1.22:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.22.1',
+            '--channel', '1.23.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
diff --git a/taskcluster/ci/toolchain/windows.yml b/taskcluster/ci/toolchain/windows.yml
index 230c01c78106..3f7af7356417 100755
--- a/taskcluster/ci/toolchain/windows.yml
+++ b/taskcluster/ci/toolchain/windows.yml
@@ -97,7 +97,7 @@ win64-clang-tidy:
             - 'taskcluster/scripts/misc/build-clang-windows-helper64.sh'
         toolchain-artifact: public/build/clang-tidy.tar.bz2
 
-win64-rust-1.22:
+win64-rust-1.23:
     description: "rust repack"
     treeherder:
         kind: build
@@ -114,7 +114,7 @@ win64-rust-1.22:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.22.1',
+            '--channel', '1.23.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
@@ -145,7 +145,7 @@ win64-rust-1.19:
         ]
         toolchain-artifact: public/build/rustc.tar.bz2
 
-win32-rust-1.23.0-beta.2:
+win32-rust-1.23:
     description: "rust repack"
     treeherder:
         kind: build
@@ -162,14 +162,14 @@ win32-rust-1.23.0-beta.2:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', 'beta-2017-12-08',
+            '--channel', '1.23.0',
             '--host', 'i686-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
         toolchain-alias: win32-rust
         toolchain-artifact: public/build/rustc.tar.bz2
 
-mingw32-rust-1.22:
+mingw32-rust-1.23:
     description: "rust repack"
     treeherder:
         kind: build
@@ -186,7 +186,7 @@ mingw32-rust-1.22:
         using: toolchain-script
         script: repack_rust.py
         arguments: [
-            '--channel', '1.22.1',
+            '--channel', '1.23.0',
             '--host', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',
             '--target', 'x86_64-unknown-linux-gnu',