Auto merge of #13477 - Manishearth:regen, r=emilio

Regenerate bindings

r? @emilio

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13477)
<!-- Reviewable:end -->

components/style/binding_tools/regen.py

@@ -438,7 +438,7 @@ def build(objdir, target_name, debug, debugger, kind_name=None,
             flags.append("{}BorrowedOrNull".format(ty))
             flags.append("--raw-line")
             flags.append("pub type {0}BorrowedOrNull<'a> = \
-                          ::gecko_bindings::sugar::ownership::Borrowed<'a, {0}>;".format(ty))
+::gecko_bindings::sugar::ownership::Borrowed<'a, {0}>;".format(ty))
             flags.append("--blacklist-type")
             flags.append("{}Borrowed".format(ty))
             flags.append("--raw-line")
@@ -455,7 +455,7 @@ def build(objdir, target_name, debug, debugger, kind_name=None,
             flags.append("{}BorrowedOrNull".format(ty))
             flags.append("--raw-line")
             flags.append("pub type {0}BorrowedOrNull<'a> = \
-                          ::gecko_bindings::sugar::ownership::Borrowed<'a, {0}>;".format(ty))
+::gecko_bindings::sugar::ownership::Borrowed<'a, {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

components/style/binding_tools/regen_atoms.py

@@ -117,8 +117,8 @@ def write_atom_macro(atoms, file_name):
 
     with open(file_name, "wb") as f:
         f.write(PRELUDE)
-        f.write("use style::gecko_bindings::structs::nsIAtom;\n\n")
+        f.write("use gecko_bindings::structs::nsIAtom;\n\n")
-        f.write("use Atom;\n\n")
+        f.write("use string_cache::Atom;\n\n")
         for source in SOURCES:
             if source.TYPE != "nsIAtom":
                 f.write("pub enum {} {{}}\n\n".format(source.TYPE))