Do build-time bindgen

Majority of build_gecko.rs is just the straightforward conversion from
regen.py. There are two differences that:
1. Side in whitelist is changed to mozilla::Side
2. std::atomic__My_base is added to opaque types for Windows

1 files changed, 0 insertions, 820 deletions

diff --git a/components/style/binding_tools/regen.py b/components/style/binding_tools/regen.py
deleted file mode 100755
index 248d50ea9ea..00000000000
--- a/components/style/binding_tools/regen.py
+++ /dev/null
@@ -1,820 +0,0 @@
-#!/usr/bin/env python
-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from __future__ import print_function
-
-import re
-import os
-import sys
-import argparse
-import platform
-import copy
-import subprocess
-import fileinput
-
-import regen_atoms
-
-DESCRIPTION = 'Regenerate the rust version of the structs or the bindings file.'
-TOOLS_DIR = os.path.dirname(os.path.abspath(__file__))
-COMMON_BUILD_KEY = "__common__"
-
-COMPILATION_TARGETS = {
-    # Flags common for all the targets.
-    COMMON_BUILD_KEY: {
-        "flags": [
-            "--no-unstable-rust",
-        ],
-        "clang_flags": [
-            "-x", "c++", "-std=c++14",
-            "-DTRACING=1", "-DIMPL_LIBXUL", "-DMOZ_STYLO_BINDINGS=1",
-            "-DMOZILLA_INTERNAL_API", "-DRUST_BINDGEN", "-DMOZ_STYLO"
-        ],
-        "search_dirs": [
-            "{}/dist/include",
-            "{}/dist/include/nspr",
-            "{}/../nsprpub/pr/include"
-        ],
-        "includes": [
-            "{}/mozilla-config.h",
-        ],
-    },
-    # Generation of style structs.
-    "structs": {
-        "target_dir": "../gecko_bindings",
-        "flags": [
-            "--enable-cxx-namespaces",
-            # FIXME(emilio): Incrementally remove these. Probably mozilla::css
-            # and mozilla::dom are easier.
-            "--raw-line", "pub use self::root::*;",
-            "--raw-line", "pub use self::root::mozilla::*;",
-            "--raw-line", "pub use self::root::mozilla::css::*;",
-            "--raw-line", "pub use self::root::mozilla::dom::*;",
-            "--generate", "types,vars",
-        ],
-        "includes": [
-            "{}/dist/include/gfxFontConstants.h",
-            "{}/dist/include/nsThemeConstants.h",
-            "{}/dist/include/mozilla/dom/AnimationEffectReadOnlyBinding.h",
-            "{}/dist/include/mozilla/ServoElementSnapshot.h",
-            "{}/dist/include/mozilla/dom/Element.h",
-            "{}/dist/include/mozilla/ServoBindings.h",
-        ],
-        "files": [
-            "{}/dist/include/nsStyleStruct.h",
-        ],
-        "build_kinds": {
-            "debug": {
-                "clang_flags": [
-                    "-DDEBUG=1",
-                    "-DJS_DEBUG=1",
-                ]
-            },
-            "release": {
-            }
-        },
-        "raw_lines": [
-            "use atomic_refcell::AtomicRefCell;",
-            "use data::ElementData;",
-        ],
-        "blacklist_types": [
-            "nsString",
-        ],
-        "whitelist_vars": [
-            "NS_THEME_.*",
-            "NODE_.*",
-            "NS_FONT_.*",
-            "NS_STYLE_.*",
-            "NS_CORNER_.*",
-            "NS_RADIUS_.*",
-            "BORDER_COLOR_.*",
-            "BORDER_STYLE_.*"
-        ],
-        "whitelist": [
-            "RawGecko.*",
-            "mozilla::ServoElementSnapshot.*",
-            "mozilla::ConsumeStyleBehavior",
-            "mozilla::LazyComputeBehavior",
-            "mozilla::css::SheetParsingMode",
-            "mozilla::SkipRootBehavior",
-            "mozilla::DisplayItemClip",  # Needed because bindgen generates
-                                         # specialization tests for this even
-                                         # though it shouldn't.
-            ".*ThreadSafe.*Holder",
-            "AnonymousContent",
-            "AudioContext",
-            "CapturingContentInfo",
-            "ConsumeStyleBehavior",
-            "DefaultDelete",
-            "DOMIntersectionObserverEntry",
-            "Element",
-            "FontFamilyList",
-            "FontFamilyListRefCnt",
-            "FontFamilyName",
-            "FontFamilyType",
-            "FragmentOrURL",
-            "FrameRequestCallback",
-            "gfxAlternateValue",
-            "gfxFontFeature",
-            "gfxFontVariation",
-            "GridNamedArea",
-            "Image",
-            "ImageURL",
-            "LazyComputeBehavior",
-            "nsAttrName",
-            "nsAttrValue",
-            "nsBorderColors",
-            "nscolor",
-            "nsChangeHint",
-            "nsCSSKeyword",
-            "nsCSSPropertyID",
-            "nsCSSRect",
-            "nsCSSRect_heap",
-            "nsCSSShadowArray",
-            "nsCSSValue",
-            "nsCSSValueFloatColor",
-            "nsCSSValueGradient",
-            "nsCSSValueGradientStop",
-            "nsCSSValueList",
-            "nsCSSValueList_heap",
-            "nsCSSValuePair_heap",
-            "nsCSSValuePairList",
-            "nsCSSValuePairList_heap",
-            "nsCSSValueTokenStream",
-            "nsCSSValueTriplet_heap",
-            "nsCursorImage",
-            "nsFont",
-            "nsIAtom",
-            "nsMainThreadPtrHandle",
-            "nsMainThreadPtrHolder",
-            "nsMargin",
-            "nsRect",
-            "nsRestyleHint",
-            "nsresult",
-            "nsSize",
-            "nsStyleBackground",
-            "nsStyleBorder",
-            "nsStyleColor",
-            "nsStyleColumn",
-            "nsStyleContent",
-            "nsStyleContentData",
-            "nsStyleContext",
-            "nsStyleCoord",
-            "nsStyleCounterData",
-            "nsStyleDisplay",
-            "nsStyleEffects",
-            "nsStyleFilter",
-            "nsStyleFont",
-            "nsStyleGradient",
-            "nsStyleGradientStop",
-            "nsStyleImage",
-            "nsStyleImageLayers",
-            "nsStyleList",
-            "nsStyleMargin",
-            "nsStyleOutline",
-            "nsStylePadding",
-            "nsStylePosition",
-            "nsStyleSVG",
-            "nsStyleSVGReset",
-            "nsStyleTable",
-            "nsStyleTableBorder",
-            "nsStyleText",
-            "nsStyleTextReset",
-            "nsStyleUIReset",
-            "nsStyleUnion",
-            "nsStyleUnit",
-            "nsStyleUserInterface",
-            "nsStyleVariables",
-            "nsStyleVisibility",
-            "nsStyleXUL",
-            "nsTArray",
-            "nsTArrayHeader",
-            "pair",
-            "Position",
-            "Runnable",
-            "ServoAttrSnapshot",
-            "ServoElementSnapshot",
-            "SheetParsingMode",
-            "Side",
-            "StaticRefPtr",
-            "StyleAnimation",
-            "StyleBasicShape",
-            "StyleBasicShapeType",
-            "StyleClipPath",
-            "StyleClipPathGeometryBox",
-            "StyleTransition",
-            "mozilla::UniquePtr",
-            "mozilla::DefaultDelete",
-        ],
-        "bitfield_enum_types": ["nsChangeHint", "nsRestyleHint"],
-        "opaque_types": [
-            "atomic___base",
-            "nsAString_internal_char_traits",
-            "nsAString_internal_incompatible_char_type",
-            "nsACString_internal_char_traits",
-            "nsACString_internal_incompatible_char_type",
-            "RefPtr_Proxy",
-            "RefPtr_Proxy_member_function",
-            "nsAutoPtr_Proxy",
-            "nsAutoPtr_Proxy_member_function",
-            "mozilla::detail::PointerType",
-            "mozilla::Pair_Base",
-            "mozilla::SupportsWeakPtr",
-            "SupportsWeakPtr",
-            "mozilla::detail::WeakReference",
-            "mozilla::WeakPtr",
-            "nsWritingIterator_reference", "nsReadingIterator_reference",
-            "nsTObserverArray",  # <- Inherits from nsAutoTObserverArray<T, 0>
-            "nsTHashtable",  # <- Inheriting from inner typedefs that clang
-                             #    doesn't expose properly.
-            "nsRefPtrHashtable", "nsDataHashtable", "nsClassHashtable",  # <- Ditto
-            "nsIDocument_SelectorCache",  # <- Inherits from nsExpirationTracker<.., 4>
-            "nsIPresShell_ScrollAxis",  # <- For some reason the alignment of this is 4
-                                        # for clang.
-            "nsPIDOMWindow",  # <- Takes the vtable from a template parameter, and we can't
-                              #    generate it conditionally.
-            "JS::Rooted",
-            "mozilla::Maybe",
-            "gfxSize",  # <- union { struct { T width; T height; }; T components[2] };
-            "gfxSize_Super",  # Ditto.
-            "mozilla::ErrorResult",  # Causes JSWhyMagic to be included & handled incorrectly.
-        ],
-        "manual_fixups": [
-            ["root::nsString", "::nsstring::nsStringRepr"]
-        ],
-        "servo_mapped_generic_types": [
-            {
-                "generic": True,
-                "gecko": "mozilla::ServoUnsafeCell",
-                "servo": "::std::cell::UnsafeCell"
-            }, {
-                "generic": True,
-                "gecko": "mozilla::ServoCell",
-                "servo": "::std::cell::Cell"
-            }, {
-                "generic": False,
-                "gecko": "ServoNodeData",
-                "servo": "AtomicRefCell<ElementData>",
-            }
-        ],
-    },
-    # Generation of the ffi bindings.
-    "bindings": {
-        "target_dir": "../gecko_bindings",
-        "raw_lines": [
-            "pub use nsstring::{nsACString, nsAString};",
-            "type nsACString_internal = nsACString;",
-            "type nsAString_internal = nsAString;"
-        ],
-        "flags": [
-            "--generate", "functions",
-            "--disable-name-namespacing",
-        ],
-        "match_headers": [
-            "ServoBindingList.h",
-            "ServoBindings.h",
-            "ServoTypes.h",
-            "nsStyleStructList.h",
-        ],
-        "files": [
-            "{}/dist/include/mozilla/ServoBindings.h",
-        ],
-        # Types to just use from the `structs` target.
-        "structs_types": [
-            "RawGeckoDocument",
-            "RawGeckoElement",
-            "RawGeckoNode",
-            "ThreadSafeURIHolder",
-            "ThreadSafePrincipalHolder",
-            "ConsumeStyleBehavior",
-            "LazyComputeBehavior",
-            "SkipRootBehavior",
-            "FontFamilyList",
-            "FontFamilyType",
-            "ServoElementSnapshot",
-            "SheetParsingMode",
-            "StyleBasicShape",
-            "StyleBasicShapeType",
-            "StyleClipPath",
-            "nsCSSKeyword",
-            "nsCSSShadowArray",
-            "nsCSSValue",
-            "nsCSSValueSharedList",
-            "nsChangeHint",
-            "nsCursorImage",
-            "nsFont",
-            "nsIAtom",
-            "nsRestyleHint",
-            "nsStyleBackground",
-            "nsStyleBorder",
-            "nsStyleColor",
-            "nsStyleColumn",
-            "nsStyleContent",
-            "nsStyleContext",
-            "nsStyleCoord",
-            "nsStyleCoord_Calc",
-            "nsStyleCoord_CalcValue",
-            "nsStyleDisplay",
-            "nsStyleEffects",
-            "nsStyleFont",
-            "nsStyleGradient",
-            "nsStyleGradientStop",
-            "nsStyleImage",
-            "nsStyleImageLayers",
-            "nsStyleImageLayers_Layer",
-            "nsStyleImageLayers_LayerType",
-            "nsStyleImageRequest",
-            "nsStyleList",
-            "nsStyleMargin",
-            "nsStyleOutline",
-            "nsStylePadding",
-            "nsStylePosition",
-            "nsStyleQuoteValues",
-            "nsStyleSVG",
-            "nsStyleSVGReset",
-            "nsStyleTable",
-            "nsStyleTableBorder",
-            "nsStyleText",
-            "nsStyleTextReset",
-            "nsStyleUIReset",
-            "nsStyleUnion",
-            "nsStyleUnit",
-            "nsStyleUserInterface",
-            "nsStyleVariables",
-            "nsStyleVisibility",
-            "nsStyleXUL",
-            "nscoord",
-            "nsresult",
-        ],
-        "array_types": {
-            "uintptr_t": "usize",
-        },
-        "servo_nullable_arc_types": [
-            "ServoComputedValues",
-            "ServoCssRules",
-            "RawServoStyleSheet",
-            "RawServoDeclarationBlock",
-            "RawServoStyleRule",
-        ],
-        "servo_owned_types": [
-            {
-                "name": "RawServoStyleSet",
-                "opaque": True,
-            }, {
-                "name": "StyleChildrenIterator",
-                "opaque": True,
-            }, {
-                "name": "ServoElementSnapshot",
-                "opaque": False,
-            },
-        ],
-        "servo_immutable_borrow_types": [
-            "RawGeckoNode",
-            "RawGeckoElement",
-            "RawGeckoDocument",
-            "RawServoDeclarationBlockStrong",
-        ],
-        "servo_borrow_types": [
-            "nsCSSValue",
-        ],
-        "whitelist_functions": [
-            "Servo_.*",
-            "Gecko_.*"
-        ]
-    },
-
-    "atoms": {
-        "custom_build": regen_atoms.build,
-    }
-}
-
-
-def platform_dependent_defines():
-    ret = []
-
-    if os.name == "posix":
-        ret.append("-DOS_POSIX=1")
-
-    system = platform.system()
-    if system == "Linux":
-        ret.append("-DOS_LINUX=1")
-    elif system == "Darwin":
-        ret.append("-DOS_MACOSX=1")
-    elif system == "Windows":
-        ret.append("-DOS_WIN=1")
-        ret.append("-DWIN32=1")
-        msvc_platform = os.environ["PLATFORM"]
-        if msvc_platform == "X86":
-            ret.append("--target=i686-pc-win32")
-        elif msvc_platform == "X64":
-            ret.append("--target=x86_64-pc-win32")
-        else:
-            raise Exception("Only MSVC builds are supported on Windows")
-        # For compatibility with MSVC 2015
-        ret.append("-fms-compatibility-version=19")
-        # To enable the builtin __builtin_offsetof so that CRT wouldn't
-        # use reinterpret_cast in offsetof() which is not allowed inside
-        # static_assert().
-        ret.append("-D_CRT_USE_BUILTIN_OFFSETOF")
-        # Enable hidden attribute (which is not supported by MSVC and
-        # thus not enabled by default with a MSVC-compatibile build)
-        # to exclude hidden symbols from the generated file.
-        ret.append("-DHAVE_VISIBILITY_HIDDEN_ATTRIBUTE=1")
-    else:
-        raise Exception("Unknown platform")
-
-    return ret
-
-
-def extend_object(obj, other):
-    if not obj or not other:
-        return obj
-
-    if isinstance(obj, list) and isinstance(other, list):
-        obj.extend(other)
-        return
-
-    assert isinstance(obj, dict) and isinstance(other, dict)
-
-    for key in other.keys():
-        if key in obj:
-            extend_object(obj[key], other[key])
-        else:
-            obj[key] = copy.deepcopy(other[key])
-
-
-def build(objdir, target_name, debug, debugger, kind_name=None,
-          output_filename=None, bindgen=None, skip_test=False,
-          verbose=False):
-    assert target_name in COMPILATION_TARGETS
-
-    current_target = COMPILATION_TARGETS[target_name]
-    if COMMON_BUILD_KEY in COMPILATION_TARGETS:
-        current_target = copy.deepcopy(COMPILATION_TARGETS[COMMON_BUILD_KEY])
-        extend_object(current_target, COMPILATION_TARGETS[target_name])
-
-    assert ((kind_name is None and "build_kinds" not in current_target) or
-            (kind_name in current_target["build_kinds"]))
-
-    if "custom_build" in current_target:
-        print("[CUSTOM] {}::{} in \"{}\"... ".format(target_name, kind_name, objdir), end='')
-        sys.stdout.flush()
-        ret = current_target["custom_build"](objdir, verbose=True)
-        if ret != 0:
-            print("FAIL")
-        else:
-            print("OK")
-
-        return ret
-
-    if bindgen is None:
-        bindgen = os.path.join(TOOLS_DIR, "rust-bindgen")
-
-    if os.path.isdir(bindgen):
-        bindgen = ["cargo", "run", "--manifest-path",
-                   os.path.join(bindgen, "Cargo.toml"), "--features", "llvm_stable", "--release", "--"]
-    else:
-        bindgen = [bindgen]
-
-    if kind_name is not None:
-        current_target = copy.deepcopy(current_target)
-        extend_object(current_target, current_target["build_kinds"][kind_name])
-
-    target_dir = None
-    if output_filename is None and "target_dir" in current_target:
-        target_dir = current_target["target_dir"]
-
-    if output_filename is None:
-        output_filename = "{}.rs".format(target_name)
-
-        if kind_name is not None:
-            output_filename = "{}_{}.rs".format(target_name, kind_name)
-
-    if target_dir:
-        output_filename = "{}/{}".format(target_dir, output_filename)
-
-    print("[BINDGEN] {}::{} in \"{}\"... ".format(target_name, kind_name, objdir), end='')
-    sys.stdout.flush()
-
-    flags = []
-
-    # Types we have to fixup since we insert them manually.
-    #
-    # Bindgen only allows us to add stuff outside of the root module. This
-    # wasn't intended to add new types, but we do so, so we postprocess the
-    # bindgen output to fixup the path to these types.
-    fixups = []
-
-    if "manual_fixups" in current_target:
-        fixups = current_target["manual_fixups"]
-
-    # This makes an FFI-safe void type that can't be matched on
-    # &VoidType is UB to have, because you can match on it
-    # to produce a reachable unreachable. If it's wrapped in
-    # a struct as a private field it becomes okay again
-    #
-    # Not 100% sure of how safe this is, but it's what we're using
-    # in the XPCOM ffi too
-    # https://github.com/nikomatsakis/rust-memory-model/issues/2
-    def zero_size_type(ty, flags):
-        flags.append("--blacklist-type")
-        flags.append(ty)
-        flags.append("--raw-line")
-        flags.append("enum {0}Void{{ }}".format(ty))
-        flags.append("--raw-line")
-        flags.append("pub struct {0}({0}Void);".format(ty))
-
-    if "flags" in current_target:
-        flags.extend(current_target["flags"])
-
-    clang_flags = []
-
-    if "clang_flags" in current_target:
-        clang_flags.extend(current_target["clang_flags"])
-
-    clang_flags.extend(platform_dependent_defines())
-
-    if platform.system() == "Windows":
-        flags.append("--use-msvc-mangling")
-
-    if "raw_lines" in current_target:
-        for raw_line in current_target["raw_lines"]:
-            flags.append("--raw-line")
-            flags.append(raw_line)
-
-    if "search_dirs" in current_target:
-        for dir_name in current_target["search_dirs"]:
-            clang_flags.append("-I")
-            clang_flags.append(dir_name.format(objdir))
-
-    if "includes" in current_target:
-        for file_name in current_target["includes"]:
-            clang_flags.append("-include")
-            clang_flags.append(file_name.format(objdir))
-
-    if "whitelist" in current_target:
-        for header in current_target["whitelist"]:
-            flags.append("--whitelist-type")
-            flags.append(header)
-
-    if "whitelist_functions" in current_target:
-        for header in current_target["whitelist_functions"]:
-            flags.append("--whitelist-function")
-            flags.append(header)
-
-    if "whitelist_vars" in current_target:
-        for header in current_target["whitelist_vars"]:
-            flags.append("--whitelist-var")
-            flags.append(header)
-
-    if "bitfield_enum_types" in current_target:
-        for ty in current_target["bitfield_enum_types"]:
-            flags.append("--bitfield-enum")
-            flags.append(ty)
-
-    if "opaque_types" in current_target:
-        for ty in current_target["opaque_types"]:
-            flags.append("--opaque-type")
-            flags.append(ty)
-
-    if "array_types" in current_target:
-        for cpp_type, rust_type in current_target["array_types"].items():
-            flags.append("--blacklist-type")
-            flags.append("nsTArrayBorrowed_{}".format(cpp_type))
-            flags.append("--raw-line")
-            flags.append("pub type nsTArrayBorrowed_{0}<'a> = &'a mut ::gecko_bindings::structs::nsTArray<{1}>;"
-                         .format(cpp_type, rust_type))
-
-    if "blacklist_types" in current_target:
-        for ty in current_target["blacklist_types"]:
-            flags.append("--blacklist-type")
-            flags.append(ty)
-
-    if "servo_nullable_arc_types" in current_target:
-        for ty in current_target["servo_nullable_arc_types"]:
-            flags.append("--blacklist-type")
-            flags.append("{}Strong".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}Strong = ::gecko_bindings::sugar::ownership::Strong<{0}>;"
-                         .format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}BorrowedOrNull".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedOrNull<'a> = \
-Option<&'a {0}>;".format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}Borrowed".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}Borrowed<'a> = &'a {0};".format(ty))
-            zero_size_type(ty, flags)
-
-    if "servo_immutable_borrow_types" in current_target:
-        for ty in current_target.get("servo_immutable_borrow_types", []) + current_target.get("servo_borrow_types", []):
-            flags.append("--blacklist-type")
-            flags.append("{}Borrowed".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}Borrowed<'a> = &'a {0};".format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}BorrowedOrNull".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedOrNull<'a> = Option<&'a {0}>;".format(ty))
-    if "servo_borrow_types" in current_target:
-        for ty in current_target["servo_borrow_types"]:
-            flags.append("--blacklist-type")
-            flags.append("{}BorrowedMut".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedMut<'a> = &'a mut {0};".format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}BorrowedMutOrNull".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedMutOrNull<'a> = \
-Option<&'a mut {0}>;".format(ty))
-            # Right now the only immutable borrow types are ones which we import
-            # from the |structs| module. As such, we don't need to create an opaque
-            # type with zero_size_type. If we ever introduce immutable borrow types
-            # which _do_ need to be opaque, we'll need a separate mode.
-
-    if "servo_mapped_generic_types" in current_target:
-        for ty in current_target["servo_mapped_generic_types"]:
-            flags.append("--blacklist-type")
-            flags.append(ty["gecko"])
-
-            gecko_name = ty["gecko"].split("::")[-1]
-            flags.append("--raw-line")
-            flags.append("pub type {0}{2} = {1}{2};".format(gecko_name, ty["servo"], "<T>" if ty["generic"] else ""))
-            fixups.append(["root::{}".format(ty["gecko"]), "::gecko_bindings::structs::{}".format(gecko_name)])
-
-    if "servo_owned_types" in current_target:
-        for entry in current_target["servo_owned_types"]:
-            ty = entry["name"]
-            flags.append("--blacklist-type")
-            flags.append("{}Borrowed".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}Borrowed<'a> = &'a {0};".format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}BorrowedMut".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedMut<'a> = &'a mut {0};".format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}Owned".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}Owned = ::gecko_bindings::sugar::ownership::Owned<{0}>;".format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}BorrowedOrNull".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedOrNull<'a> = Option<&'a {0}>;"
-                         .format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}BorrowedMutOrNull".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}BorrowedMutOrNull<'a> = Option<&'a mut {0}>;"
-                         .format(ty))
-            flags.append("--blacklist-type")
-            flags.append("{}OwnedOrNull".format(ty))
-            flags.append("--raw-line")
-            flags.append("pub type {0}OwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull<{0}>;".format(ty))
-            if entry["opaque"]:
-                zero_size_type(ty, flags)
-
-    if "structs_types" in current_target:
-        for ty in current_target["structs_types"]:
-            flags.append("--blacklist-type")
-            flags.append(ty)
-            flags.append("--raw-line")
-            flags.append("use gecko_bindings::structs::{};".format(ty))
-
-            # TODO: this is hacky, figure out a better way to do it without
-            # hardcoding everything...
-            if ty.startswith("nsStyle"):
-                flags.extend([
-                    "--raw-line",
-                    "unsafe impl Send for {} {{}}".format(ty),
-                    "--raw-line",
-                    "unsafe impl Sync for {} {{}}".format(ty),
-                ])
-
-    flags.append("-o")
-    flags.append(output_filename)
-
-    assert len(current_target["files"]) == 1
-    flags.append(current_target["files"][0].format(objdir))
-
-    flags = bindgen + flags + ["--"] + clang_flags
-
-    if verbose:
-        print(flags)
-
-    output = ""
-    try:
-        if debug:
-            flags = [debugger, "--args"] + flags
-            subprocess.check_call(flags)
-        else:
-            output = subprocess.check_output(flags, stderr=subprocess.STDOUT,
-                                             universal_newlines=True)
-    except subprocess.CalledProcessError as e:
-        print("FAIL\n", e.output)
-        return 1
-
-    generated = fileinput.input(output_filename, inplace=True)
-    for line in generated:
-        for fixup in fixups:
-            line = re.sub("\\b{}\\b".format(fixup[0]), fixup[1], line)
-        print(line, end='')
-    generated.close()
-
-    print("OK")
-    print("(please test with ./mach test-stylo)")
-
-    if verbose:
-        print(output)
-
-    return 0
-
-
-def builds_for(target_name, kind):
-    if target_name == "all":
-        for target in COMPILATION_TARGETS.keys():
-            if target == COMMON_BUILD_KEY:
-                continue
-
-            if "build_kinds" in COMPILATION_TARGETS[target]:
-                for kind in COMPILATION_TARGETS[target]["build_kinds"].keys():
-                    yield (target, kind)
-            else:
-                yield (target, None)
-        return
-
-    target = COMPILATION_TARGETS[target_name]
-    if "build_kinds" in target:
-        if kind is None:
-            for kind in target["build_kinds"].keys():
-                yield(target_name, kind)
-        else:
-            yield (target_name, kind)
-        return
-
-    yield (target_name, None)
-
-
-def main():
-    parser = argparse.ArgumentParser(description=DESCRIPTION)
-    parser.add_argument('--target', default='all',
-                        help='The target to build, either "structs" or "bindings"')
-    parser.add_argument('--kind',
-                        help='Kind of build')
-    parser.add_argument('--bindgen',
-                        help='Override bindgen binary')
-    parser.add_argument('--output', '-o',
-                        help='Output of the script')
-    parser.add_argument('--skip-test',
-                        action='store_true',
-                        help='Skip automatic tests, useful for debugging')
-    parser.add_argument('--verbose', '-v',
-                        action='store_true',
-                        help='Be... verbose')
-    parser.add_argument('--debug',
-                        action='store_true',
-                        help='Try to use a debugger to debug bindgen commands (default: gdb)')
-    parser.add_argument('--debugger', default='gdb',
-                        help='Debugger to use. Only used if --debug is passed.')
-    parser.add_argument('objdir')
-
-    args = parser.parse_args()
-
-    if not os.path.isdir(args.objdir):
-        print("\"{}\" doesn't seem to be a directory".format(args.objdir))
-        return 1
-
-    if (args.target != "all" and args.target not in COMPILATION_TARGETS) or args.target == COMMON_BUILD_KEY:
-        print("{} is not a valid compilation target.".format(args.target))
-        print("Valid compilation targets are:")
-        for target in COMPILATION_TARGETS.keys():
-            if target != COMMON_BUILD_KEY:
-                print("\t * {}".format(target))
-        return 1
-
-    current_target = COMPILATION_TARGETS.get(args.target, {})
-    if args.kind and "build_kinds" in current_target and args.kind not in current_target["build_kinds"]:
-        print("{} is not a valid build kind.".format(args.kind))
-        print("Valid build kinds are:")
-        for kind in current_target["build_kinds"].keys():
-            print("\t * {}".format(kind))
-        return 1
-
-    for target, kind in builds_for(args.target, args.kind):
-        ret = build(args.objdir, target, kind_name=kind,
-                    debug=args.debug, debugger=args.debugger,
-                    bindgen=args.bindgen, skip_test=args.skip_test,
-                    output_filename=args.output,
-                    verbose=args.verbose)
-        if ret != 0:
-            print("{}::{} failed".format(target, kind))
-            return ret
-
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())