Bug 1478561 - Bump OOM hook rustc version check to check for greater than 1.30.0-alpha. draft
authorChris Manchester <cmanchester@mozilla.com>
Mon, 30 Jul 2018 16:46:20 -0700
changeset 824472 637a9470ef087f1314c4344d9b237c647da07524
parent 824471 818d911f011a791e83254a412271090756d7fd59
push id117923
push userbmo:cmanchester@mozilla.com
push dateMon, 30 Jul 2018 23:47:12 +0000
bugs1478561
milestone63.0a1
Bug 1478561 - Bump OOM hook rustc version check to check for greater than 1.30.0-alpha. MozReview-Commit-ID: ESiK7tqHMT0
toolkit/library/rust/shared/build.rs
--- a/toolkit/library/rust/shared/build.rs
+++ b/toolkit/library/rust/shared/build.rs
@@ -4,20 +4,20 @@ use rustc_version::{version, Version};
 
 fn main() {
     let ver = version().unwrap();
     let mut bootstrap = false;
 
     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.29.0").unwrap() {
+    } else if ver >= Version::parse("1.28.0-alpha").unwrap() && ver < Version::parse("1.30.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.29.0-alpha").unwrap() {
+    } else if std::env::var("MOZ_AUTOMATION").is_ok() && ver >= Version::parse("1.30.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")
     }
 
     // This is a rather awful thing to do, but we're only doing it on
     // versions of rustc that are not going to change the unstable APIs
     // we use from under us, all being already released or beta.