Backed out 2 changesets (bug 1502964) for build bustages CLOSED TREE

Backed out changeset 26815a566707 (bug 1502964)
Backed out changeset 6015a119c154 (bug 1502964)

.cargo/config.in

@@ -12,11 +12,6 @@ git = "https://github.com/servo/serde"
 branch = "deserialize_from_enums8"
 replace-with = "vendored-sources"
 
-[source."https://github.com/retep998/winapi-rs"]
-git = "https://github.com/froydnj/winapi-rs"
-branch = "aarch64"
-replace-with = "vendored-sources"
-
 [source.vendored-sources]
 directory = '@top_srcdir@/third_party/rust'
 

Cargo.toml

@@ -63,4 +63,3 @@ codegen-units = 1
 [patch.crates-io]
 libudev-sys = { path = "dom/webauthn/libudev-sys" }
 serde_derive = { git = "https://github.com/servo/serde", branch = "deserialize_from_enums8" }
-winapi = { git = "https://github.com/froydnj/winapi-rs", branch = "aarch64" }

python/mozbuild/mozbuild/vendor_rust.py

@@ -15,7 +15,6 @@
 import mozpack.path as mozpath
 import os
 import re
-import shutil
 import subprocess
 import sys
 
@@ -325,31 +324,6 @@ def vendor(self, ignore_modified=False,
                      '''The changes from `mach vendor rust` will NOT be added to version control.''')
             sys.exit(1)
 
-        # XXX We have to vendor winapi and associated crates from a branch
-        # until upstream merges in some necessary features.  Unfortunately,
-        # due to the structure of said crates, `cargo vendor` directly from
-        # a branch results in a bunch of extraneous stuff that wouldn't be
-        # included in the published crate.  So we have to fix things up
-        # on our own.
-        winapi_dir = mozpath.join(vendor_dir, 'winapi')
-        i686_dir = mozpath.join(vendor_dir, 'winapi-i686-pc-windows-gnu')
-        x64_dir = mozpath.join(vendor_dir, 'winapi-x86_64-pc-windows-gnu')
-
-        # These directories are either excluded from the published crate or
-        # are separately vendored crates themselves.
-        winapi_delete_dirs = ['i686', 'x86_64', 'tests']
-        for d in winapi_delete_dirs:
-            x = mozpath.join(winapi_dir, d)
-            if os.path.isdir(x):
-                shutil.rmtree(x)
-
-        # The published crates for individual architectures do not include
-        # the `def` directory.
-        for d in [i686_dir, x64_dir]:
-            x = mozpath.join(d, 'def')
-            if os.path.isdir(x):
-                shutil.rmtree(x)
-
         self.repository.add_remove_files(vendor_dir)
 
         # 100k is a reasonable upper bound on source file size.

third_party/rust/winapi-i686-pc-windows-gnu/Cargo.toml

@@ -1,10 +1,22 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g. crates.io) dependencies
+#
+# If you believe there's an error in this file please file an
+# issue against the rust-lang/cargo repository. If you're
+# editing this file be aware that the upstream Cargo.toml
+# will likely look very different (and much more reasonable)
+
 [package]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
 authors = ["Peter Atashian <retep998@gmail.com>"]
-license = "MIT/Apache-2.0"
+build = "build.rs"
+include = ["src/*", "lib/*", "Cargo.toml", "build.rs"]
 description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."
-repository = "https://github.com/retep998/winapi-rs"
 keywords = ["windows"]
-include = ["/src/*", "/lib/*", "/Cargo.toml", "/LICENSE-MIT", "/LICENSE-APACHE", "/build.rs"]
-build = "build.rs"
+license = "MIT/Apache-2.0"
+repository = "https://github.com/retep998/winapi-rs"