From c33be7adfb65da5a9f9c45d45a663a319f1aa911 Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Wed, 3 Apr 2019 15:11:43 +0000
Subject: [PATCH] Bug 1533010 - Update Windows Rust to 1.34 beta r=glandium

This is needed for cross-language LTO (bug 1512723). We don't want to block on waiting for 1.34's release, so we'll get a head start now, but we'll update to the final 1.34 release when available. Rust Forge estimates the release at 11 April.

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

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/toolchain/cbindgen.yml | 2 +-
 taskcluster/ci/toolchain/grcov.yml    | 2 +-
 taskcluster/ci/toolchain/rust.yml     | 6 +++---
 toolkit/library/rust/shared/build.rs  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/taskcluster/ci/toolchain/cbindgen.yml b/taskcluster/ci/toolchain/cbindgen.yml
index 15f6806c9686..9fe6e93105c0 100644
--- a/taskcluster/ci/toolchain/cbindgen.yml
+++ b/taskcluster/ci/toolchain/cbindgen.yml
@@ -52,4 +52,4 @@ win64-cbindgen:
         arguments: ['x86_64-pc-windows-msvc']
         toolchain-artifact: public/build/cbindgen.tar.bz2
     toolchains:
-        - win64-rust-1.32
+        - win64-rust-1.34
diff --git a/taskcluster/ci/toolchain/grcov.yml b/taskcluster/ci/toolchain/grcov.yml
index 4b7d5aa3f20e..bf5a94849994 100644
--- a/taskcluster/ci/toolchain/grcov.yml
+++ b/taskcluster/ci/toolchain/grcov.yml
@@ -38,4 +38,4 @@ win64-grcov:
     run:
         toolchain-artifact: public/build/grcov.tar.bz2
     toolchains:
-        - win64-rust-1.32
+        - win64-rust-1.34
diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml
index 25147b2b725a..846b1b2ca790 100644
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -125,12 +125,12 @@ win64-rust-1.28:
         ]
         toolchain-artifact: public/build/rustc.tar.bz2
 
-win64-rust-1.32:
+win64-rust-1.34:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
-            '--channel', '1.32.0',
+            '--channel', 'beta-2019-03-27',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
@@ -157,7 +157,7 @@ win64-aarch64-rust:
         symbol: TW64(rust-aarch64)
     run:
         arguments: [
-            '--channel', '1.32.0',
+            '--channel', 'beta-2019-03-27',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'aarch64-pc-windows-msvc',
diff --git a/toolkit/library/rust/shared/build.rs b/toolkit/library/rust/shared/build.rs
index 318fc72e0457..db6fb91346c5 100644
--- a/toolkit/library/rust/shared/build.rs
+++ b/toolkit/library/rust/shared/build.rs
@@ -5,7 +5,7 @@ use rustc_version::{version, Version};
 fn main() {
     let ver = version().unwrap();
     let mut bootstrap = false;
-    let max_oom_hook_version = Version::parse("1.33.0-alpha").unwrap();
+    let max_oom_hook_version = Version::parse("1.35.0-alpha").unwrap();
 
     if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < max_oom_hook_version {
         println!("cargo:rustc-cfg=feature=\"oom_with_hook\"");