auto merge of #2113 : Ms2ger/servo/DefineDOMInterface, r=jdm

This moves the assertion from its only caller into the function itself, to
clarify that we don't intent to deal with any failure here.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index c1d4ac46aaa..4a773b517d2 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2123,7 +2123,7 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
     """
     def __init__(self, descriptor):
         args = [Argument('&mut JSPageInfo', 'js_info')]
-        CGAbstractMethod.__init__(self, descriptor, 'DefineDOMInterface', 'bool', args, pub=True)
+        CGAbstractMethod.__init__(self, descriptor, 'DefineDOMInterface', 'void', args, pub=True)
 
     def define(self):
         return CGAbstractMethod.define(self)
@@ -2180,7 +2180,7 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod):
         return (body + """  let cx = js_info.js_context.deref().ptr;
   let receiver = js_info.js_compartment.global_obj;
   let global: *JSObject = JS_GetGlobalForObject(cx, receiver);
-  return %s(cx, global, receiver).is_not_null();""" % (getter))
+  assert!(%s(cx, global, receiver).is_not_null());""" % (getter))
 
 def needCx(returnType, arguments, extendedAttributes, considerTypes):
     return (considerTypes and
@@ -4378,7 +4378,7 @@ class CGRegisterProtos(CGAbstractMethod):
         self.config = config
 
     def _registerProtos(self):
-        lines = ["  assert!(codegen::%sBinding::DefineDOMInterface(js_info));" % (desc.name)
+        lines = ["  codegen::%sBinding::DefineDOMInterface(js_info);" % desc.name
                  for desc in self.config.getDescriptors(hasInterfaceObject=True,
                                                         register=True)]
         return '\n'.join(lines) + '\n'