From b1a4da1153851037f8e542ec1d8131b8f563e58b Mon Sep 17 00:00:00 2001
From: smolnar <smolnar@mozilla.com>
Date: Tue, 30 Mar 2021 12:45:04 +0300
Subject: [PATCH] Backed out changeset 4dc85d4d7f33 (bug 1700562) for causing
 wrench bustages. CLOSED TREE

---
 taskcluster/ci/toolchain/rust.yml    | 40 ++++++++++++++--------------
 toolkit/library/rust/shared/build.rs |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/taskcluster/ci/toolchain/rust.yml b/taskcluster/ci/toolchain/rust.yml
index dc045891bb86..5c2235bf6ae3 100644
--- a/taskcluster/ci/toolchain/rust.yml
+++ b/taskcluster/ci/toolchain/rust.yml
@@ -27,12 +27,12 @@ linux64-rust-1.47:
         toolchain:
             - linux64-clang
 
-linux64-rust-1.51:
+linux64-rust-1.50:
     treeherder:
         symbol: TL(rust)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -52,7 +52,7 @@ linux64-rust-nightly:
         arguments: [
             # First nightly with the version after 1.49.0, so that it's the
             # closest to 1.49 release that has a bigger version number.
-            # This can't be upgraded to the first with the version after 1.51.0
+            # This can't be upgraded to the first with the version after 1.50.0
             # because of https://github.com/rust-lang/rust/pull/80082, which
             # reverted the changes needed to use -Zbuild-std in TSAN builds.
             '--channel', 'nightly-2020-11-14',
@@ -82,13 +82,13 @@ linux64-rust-dev:
             - linux64-binutils
 
 
-linux64-rust-cross-1.51:
+linux64-rust-cross-1.50:
     description: "rust repack with macos and windows cross support"
     treeherder:
         symbol: TL(rust-cross)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -105,13 +105,13 @@ linux64-rust-cross-1.51:
         ]
         toolchain-alias: linux64-rust-cross
 
-linux64-rust-static-1.51:
+linux64-rust-static-1.50:
     description: "rust repack with static linking support"
     treeherder:
         symbol: TL(rust-static)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-musl',
@@ -145,13 +145,13 @@ linux64-rust-macos-1.49:
             '--target', 'aarch64-apple-darwin',
         ]
 
-linux64-rust-macos-1.51:
+linux64-rust-macos-1.50:
     description: "rust repack with macos-cross support"
     treeherder:
-        symbol: TL(rust-macos-1.51)
+        symbol: TL(rust-macos-1.50)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -159,13 +159,13 @@ linux64-rust-macos-1.51:
         ]
         toolchain-alias: linux64-rust-macos
 
-linux64-rust-android-1.51:
+linux64-rust-android-1.50:
     description: "rust repack with android-cross support"
     treeherder:
         symbol: TL(rust-android)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
@@ -193,13 +193,13 @@ linux64-rust-windows-1.47:
             '--target', 'i686-pc-windows-msvc',
         ]
 
-linux64-rust-windows-1.51:
+linux64-rust-windows-1.50:
     description: "rust repack with windows-cross support"
     treeherder:
         symbol: TL(rust-win)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-pc-windows-msvc',
@@ -219,12 +219,12 @@ win64-rust-1.47:
             '--target', 'aarch64-pc-windows-msvc',
         ]
 
-win64-rust-1.51:
+win64-rust-1.50:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
@@ -232,12 +232,12 @@ win64-rust-1.51:
         ]
         toolchain-alias: win64-rust
 
-macosx64-rust-1.51:
+macosx64-rust-1.50:
     treeherder:
         symbol: TM(rust)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-apple-darwin',
             '--target', 'x86_64-apple-darwin',
         ]
@@ -256,12 +256,12 @@ mingw32-rust-1.47:
             '--target', 'x86_64-unknown-linux-gnu',
         ]
 
-mingw32-rust-1.51:
+mingw32-rust-1.50:
     treeherder:
         symbol: TMW(rust)
     run:
         arguments: [
-            '--channel', '1.51.0',
+            '--channel', '1.50.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
             '--target', 'i686-pc-windows-gnu',
diff --git a/toolkit/library/rust/shared/build.rs b/toolkit/library/rust/shared/build.rs
index a561ca0b99fc..484e7d37d3f1 100644
--- a/toolkit/library/rust/shared/build.rs
+++ b/toolkit/library/rust/shared/build.rs
@@ -9,7 +9,7 @@ use rustc_version::{version, Version};
 fn main() {
     let ver = version().unwrap();
     let mut bootstrap = false;
-    let max_oom_hook_version = Version::parse("1.52.0-alpha").unwrap();
+    let max_oom_hook_version = Version::parse("1.51.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\"");