From 97b92e04f08f7228e1500a3cfb7d05825a6690cb Mon Sep 17 00:00:00 2001 From: Chris Manchester Date: Wed, 29 Aug 2018 00:41:53 +0000 Subject: [PATCH] Bug 1485184 - Bump enforced upper rustc version limit. r=glandium Differential Revision: https://phabricator.services.mozilla.com/D4036 --HG-- extra : moz-landing-system : lando --- toolkit/library/rust/shared/build.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/library/rust/shared/build.rs b/toolkit/library/rust/shared/build.rs index afae7d37abf3..a1d0c89e8c20 100644 --- a/toolkit/library/rust/shared/build.rs +++ b/toolkit/library/rust/shared/build.rs @@ -9,10 +9,10 @@ fn main() { if ver >= Version::parse("1.24.0").unwrap() && ver < Version::parse("1.27.0").unwrap() { println!("cargo:rustc-cfg=feature=\"oom_with_global_alloc\""); bootstrap = true; - } else if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < Version::parse("1.30.0-alpha").unwrap() { + } else if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < Version::parse("1.31.0-alpha").unwrap() { println!("cargo:rustc-cfg=feature=\"oom_with_hook\""); bootstrap = true; - } else if std::env::var("MOZ_AUTOMATION").is_ok() && ver >= Version::parse("1.30.0-alpha").unwrap() { + } else if std::env::var("MOZ_AUTOMATION").is_ok() && ver >= Version::parse("1.31.0-alpha").unwrap() { // For the sake of the base-toolchains build we allow building with 1.27, but // retain this check for newer versions. panic!("Builds on automation must use a version of rust that supports OOM hooking")