Backed out 3 changesets (bug 1595218) for causing wrench bustages on central CLOSED TREE a=backout

Backed out changeset 1808b1722f64 (bug 1595218)
Backed out changeset 46fe2af291cf (bug 1595218)
Backed out changeset 11c0576cf3d5 (bug 1595218)

build/moz.configure/rust.configure

@@ -262,11 +262,9 @@ def rust_triple_alias(host_or_target, host_or_target_c_compiler):
                 elif narrowed:
                     candidates = narrowed
 
-                vendor_aliases = {'pc': ('w64', 'windows')}
+                vendor_aliases = {'pc': 'w64'}
                 narrowed = [c for c in candidates
-                            if c.target.vendor in vendor_aliases and
+                            if vendor_aliases.get(c.target.vendor) == host_or_target.vendor]
-                            host_or_target.vendor in vendor_aliases[c.target.vendor]]
-
                 if len(narrowed) == 1:
                     return narrowed[0].rust_target
 

python/mozboot/mozboot/base.py

@@ -158,7 +158,7 @@ MODERN_MERCURIAL_VERSION = LooseVersion('4.8')
 MODERN_PYTHON_VERSION = LooseVersion('2.7.3')
 
 # Upgrade rust older than this.
-MODERN_RUST_VERSION = LooseVersion('1.39.0')
+MODERN_RUST_VERSION = LooseVersion('1.37.0')
 
 # Upgrade nasm older than this.
 MODERN_NASM_VERSION = LooseVersion('2.14')

python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py

@@ -1670,22 +1670,6 @@ def gen_invoke_rustc(version, rustup_wrapper=False):
                     'x86_64-uwp-windows-gnu',
                     'x86_64-wrs-vxworks',
                 ]
-            # Additional targets from 1.38
-            if Version(version) >= '1.39.0':
-                rust_targets += [
-                    'aarch64-uwp-windows-msvc',
-                    'armv7-wrs-vxworks-eabihf',
-                    'i686-unknown-uefi',
-                    'i686-uwp-windows-msvc',
-                    'mips64-unknown-linux-muslabi64',
-                    'mips64el-unknown-linux-muslabi64',
-                    'sparc64-unknown-openbsd',
-                    'x86_64-linux-kernel',
-                    'x86_64-uwp-windows-msvc',
-                ]
-                rust_targets.remove('armv7-wrs-vxworks')
-                rust_targets.remove('i586-wrs-vxworks')
-
             return 0, '\n'.join(sorted(rust_targets)), ''
         if (len(args) == 6 and args[:2] == ('--crate-type', 'staticlib') and
             args[2].startswith('--target=') and args[3] == '-o'):
@@ -1697,7 +1681,7 @@ def gen_invoke_rustc(version, rustup_wrapper=False):
 
 
 class RustTest(BaseConfigureTest):
-    def get_rust_target(self, target, compiler_type='gcc', version='1.39.0',
+    def get_rust_target(self, target, compiler_type='gcc', version='1.38.0',
                         arm_target=None):
         environ = {
             'PATH': os.pathsep.join(
@@ -1781,7 +1765,6 @@ class RustTest(BaseConfigureTest):
             ('x86_64-pc-mingw32', 'clang', 'x86_64-pc-windows-gnu'),
             ('i686-w64-mingw32', 'clang', 'i686-pc-windows-gnu'),
             ('x86_64-w64-mingw32', 'clang', 'x86_64-pc-windows-gnu'),
-            ('aarch64-windows-mingw32', 'clang-cl', 'aarch64-pc-windows-msvc'),
         ):
             self.assertEqual(self.get_rust_target(autoconf, building_with_gcc), rust)
 

taskcluster/ci/toolchain/dist-toolchains.yml

@@ -35,5 +35,5 @@ rustc-dist-toolchain:
         toolchain-artifact: public/build/rustc-dist-toolchain.tar.xz
     fetches:
         toolchain:
-            - linux64-rust-cross-1.39
+            - linux64-rust-cross-1.38
             - linux64-sccache

taskcluster/ci/toolchain/misc.yml

@@ -189,7 +189,7 @@ wrench-deps:
         fetch:
             - android-rs-glue
         toolchain:
-            - linux64-rust-1.39  # whatever m-c is built with
+            - linux64-rust-1.37  # whatever m-c is built with
 
 lucetc:
     description: "lucetc build process"

taskcluster/ci/toolchain/rust.yml

@@ -94,23 +94,11 @@ linux64-rust-1.37:
         ]
 
 linux64-rust-1.38:
-    treeherder:
-        symbol: TL(rust-1.38.0)
-    run:
-        arguments: [
-            '--channel', '1.38.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'i686-unknown-linux-gnu',
-            '--target', 'aarch64-unknown-linux-gnu',
-        ]
-
-linux64-rust-1.39:
     treeherder:
         symbol: TL(rust)
     run:
         arguments: [
-            '--channel', '1.39.0',
+            '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'i686-unknown-linux-gnu',
@@ -178,13 +166,13 @@ linux64-rust-macos-1.35:
             '--target', 'x86_64-apple-darwin',
         ]
 
-linux64-rust-cross-1.39:
+linux64-rust-cross-1.38:
     description: "rust repack with macos and windows cross support"
     treeherder:
         symbol: TL(rust-cross)
     run:
         arguments: [
-            '--channel', '1.39.0',
+            '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -218,24 +206,12 @@ linux64-rust-macos-1.37:
         ]
 
 linux64-rust-macos-1.38:
-    description: "rust repack with macos-cross support"
-    treeherder:
-        symbol: TL(rust-macos-1.38)
-    run:
-        arguments: [
-            '--channel', '1.38.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-apple-darwin',
-        ]
-
-linux64-rust-macos-1.39:
     description: "rust repack with macos-cross support"
     treeherder:
         symbol: TL(rust-macos)
     run:
         arguments: [
-            '--channel', '1.39.0',
+            '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-apple-darwin',
@@ -259,28 +235,12 @@ linux64-rust-android-1.37:
         ]
 
 linux64-rust-android-1.38:
-    description: "rust repack with android-cross support"
-    treeherder:
-        symbol: TL(rust-android-1.38)
-    run:
-        arguments: [
-            '--channel', '1.38.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'armv7-linux-androideabi',
-            '--target', 'thumbv7neon-linux-androideabi',
-            '--target', 'aarch64-linux-android',
-            '--target', 'i686-linux-android',
-            '--target', 'x86_64-linux-android',
-        ]
-
-linux64-rust-android-1.39:
     description: "rust repack with android-cross support"
     treeherder:
         symbol: TL(rust-android)
     run:
         arguments: [
-            '--channel', '1.39.0',
+            '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'armv7-linux-androideabi',
@@ -305,25 +265,12 @@ linux64-rust-windows-1.37:
         ]
 
 linux64-rust-windows-1.38:
-    description: "rust repack with windows-cross support"
-    treeherder:
-        symbol: TL(rust-win-1.38)
-    run:
-        arguments: [
-            '--channel', '1.38.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-            '--target', 'x86_64-pc-windows-msvc',
-            '--target', 'i686-pc-windows-msvc',
-        ]
-
-linux64-rust-windows-1.39:
     description: "rust repack with windows-cross support"
     treeherder:
         symbol: TL(rust-win)
     run:
         arguments: [
-            '--channel', '1.39.0',
+            '--channel', '1.38.0',
             '--host', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
             '--target', 'x86_64-pc-windows-msvc',
@@ -367,23 +314,11 @@ win64-rust-1.37:
         ]
 
 win64-rust-1.38:
-    treeherder:
-        symbol: TW64(rust-1.38)
-    run:
-        arguments: [
-            '--channel', '1.38.0',
-            '--host', 'x86_64-pc-windows-msvc',
-            '--target', 'x86_64-pc-windows-msvc',
-            '--target', 'i686-pc-windows-msvc',
-            '--target', 'aarch64-pc-windows-msvc',
-        ]
-
-win64-rust-1.39:
     treeherder:
         symbol: TW64(rust)
     run:
         arguments: [
-            '--channel', '1.39.0',
+            '--channel', '1.38.0',
             '--host', 'x86_64-pc-windows-msvc',
             '--target', 'x86_64-pc-windows-msvc',
             '--target', 'i686-pc-windows-msvc',
@@ -419,7 +354,7 @@ mingw32-rust-1.37:
 
 mingw32-rust-1.38:
     treeherder:
-        symbol: TMW(rust-1.38)
+        symbol: TMW(rust)
     run:
         arguments: [
             '--channel', '1.38.0',
@@ -429,17 +364,4 @@ mingw32-rust-1.38:
             '--target', 'x86_64-pc-windows-gnu',
             '--target', 'x86_64-unknown-linux-gnu',
         ]
-
-mingw32-rust-1.39:
-    treeherder:
-        symbol: TMW(rust)
-    run:
-        arguments: [
-            '--channel', '1.39.0',
-            '--host', 'x86_64-unknown-linux-gnu',
-            '--target', 'i686-unknown-linux-gnu',
-            '--target', 'i686-pc-windows-gnu',
-            '--target', 'x86_64-pc-windows-gnu',
-            '--target', 'x86_64-unknown-linux-gnu',
-        ]
         toolchain-alias: mingw32-rust