From 864dd6aa8ee269991624f7cb06cd063971facdf0 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <n.oxyde@gmail.com>
Date: Tue, 3 Jan 2017 05:13:23 -0800
Subject: [PATCH] servo: Merge #14686 - Improve dead_code handling a bit (from
 nox:dom); r=jdm

Source-Repo: https://github.com/servo/servo
Source-Revision: 2694463b08f8f37b8a5351fa3199b3283b90cb3d
---
 servo/components/script/dom/bindings/codegen/CodegenRust.py | 2 +-
 .../components/script/dom/bindings/codegen/Configuration.py | 2 ++
 servo/components/script/dom/bindings/mod.rs                 | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/servo/components/script/dom/bindings/codegen/CodegenRust.py b/servo/components/script/dom/bindings/codegen/CodegenRust.py
index d68b1adf33e2..579f84301d30 100644
--- a/servo/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/servo/components/script/dom/bindings/codegen/CodegenRust.py
@@ -5796,7 +5796,7 @@ class CGNonNamespacedEnum(CGThing):
         entries = ["%s = %s" % (names[0], first)] + names[1:]
 
         # Append a Last.
-        entries.append('Last = ' + str(first + len(entries)))
+        entries.append('#[allow(dead_code)] Last = ' + str(first + len(entries)))
 
         # Indent.
         entries = ['    ' + e for e in entries]
diff --git a/servo/components/script/dom/bindings/codegen/Configuration.py b/servo/components/script/dom/bindings/codegen/Configuration.py
index f2f64e9bee0c..14a11c139a9b 100644
--- a/servo/components/script/dom/bindings/codegen/Configuration.py
+++ b/servo/components/script/dom/bindings/codegen/Configuration.py
@@ -399,6 +399,8 @@ class Descriptor(DescriptorProvider):
 
     def shouldHaveGetConstructorObjectMethod(self):
         assert self.interface.hasInterfaceObject()
+        if self.interface.getExtendedAttribute("Inline"):
+            return False
         return self.interface.isCallback() or self.interface.isNamespace() or self.hasDescendants()
 
     def isExposedConditionally(self):
diff --git a/servo/components/script/dom/bindings/mod.rs b/servo/components/script/dom/bindings/mod.rs
index 4e7920828dd2..725cdbb4a8ba 100644
--- a/servo/components/script/dom/bindings/mod.rs
+++ b/servo/components/script/dom/bindings/mod.rs
@@ -157,9 +157,9 @@ pub mod weakref;
 pub mod xmlname;
 
 /// Generated JS-Rust bindings.
-#[allow(dead_code, missing_docs, non_snake_case)]
+#[allow(missing_docs, non_snake_case)]
 pub mod codegen {
-    #[allow(unrooted_must_root)]
+    #[allow(dead_code, unrooted_must_root)]
     pub mod Bindings {
         include!(concat!(env!("OUT_DIR"), "/Bindings/mod.rs"));
     }
@@ -169,7 +169,7 @@ pub mod codegen {
     pub mod InterfaceTypes {
         include!(concat!(env!("OUT_DIR"), "/InterfaceTypes.rs"));
     }
-    #[allow(unused_imports)]
+    #[allow(dead_code, unused_imports)]
     pub mod InheritTypes {
         include!(concat!(env!("OUT_DIR"), "/InheritTypes.rs"));
     }