Bug 1533010 - Update Windows Rust to 1.34 beta r=glandium
authorDavid Major <dmajor@mozilla.com>
Wed, 03 Apr 2019 15:11:43 +0000
changeset 467790 e3809f2c3cb2f6e8b3d09ee975ef2f53c8c60fb2
parent 467789 8fa27903feba34c706e400f6270bc0f712672a45
child 467791 1bc2b905a774f183489e37075086af51dd08b178
push id35810
push useraciure@mozilla.com
push dateThu, 04 Apr 2019 04:33:36 +0000
treeherdermozilla-central@b72c02e34261 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1533010, 1512723
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
taskcluster/ci/toolchain/cbindgen.yml
taskcluster/ci/toolchain/grcov.yml
taskcluster/ci/toolchain/rust.yml
toolkit/library/rust/shared/build.rs
--- a/taskcluster/ci/toolchain/cbindgen.yml
+++ b/taskcluster/ci/toolchain/cbindgen.yml
@@ -47,9 +47,9 @@ win64-cbindgen:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
     run:
         arguments: ['x86_64-pc-windows-msvc']
         toolchain-artifact: public/build/cbindgen.tar.bz2
     toolchains:
-        - win64-rust-1.32
+        - win64-rust-1.34
--- a/taskcluster/ci/toolchain/grcov.yml
+++ b/taskcluster/ci/toolchain/grcov.yml
@@ -33,9 +33,9 @@ win64-grcov:
         symbol: TW64(grcov)
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/sccache-build.manifest"
     run:
         toolchain-artifact: public/build/grcov.tar.bz2
     toolchains:
-        - win64-rust-1.32
+        - win64-rust-1.34
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -120,22 +120,22 @@ win64-rust-1.28:
         arguments: [
             '--channel', '1.28.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
         ]
         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',
         ]
         toolchain-alias: win64-rust
         toolchain-artifact: public/build/rustc.tar.bz2
 
 win64-rust-nightly:
@@ -152,17 +152,17 @@ win64-rust-nightly:
         toolchain-artifact: public/build/rustc.tar.bz2
 
 win64-aarch64-rust:
     description: "rust repack with aarch64 support"
     treeherder:
         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',
             '--target', 'i686-pc-windows-msvc',
         ]
         toolchain-artifact: public/build/rustc.tar.bz2
 
 mingw32-rust-1.31:
--- a/toolkit/library/rust/shared/build.rs
+++ b/toolkit/library/rust/shared/build.rs
@@ -1,16 +1,16 @@
 extern crate rustc_version;
 
 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\"");
         bootstrap = true;
     } else if std::env::var("MOZ_AUTOMATION").is_ok() {
         panic!("Builds on automation must use a version of rust for which we know how to hook OOM: want < {}, have {}",
                max_oom_hook_version, ver);
     }