From a6a06e0ffc1e84af1ec5d105c439fc23a59eec95 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 24 Apr 2014 23:52:25 +0200 Subject: Inline CGAbstractBindingMethod.getThis. There's no good reason to keep this separate; it's only called once, and inlining the function makes the code a little clearer. This commit does not make any change to the generated code. --- src/components/script/dom/bindings/codegen/CodegenRust.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'src/components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index a0bbc521f5a..769674a0b3a 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -2493,21 +2493,18 @@ class CGAbstractBindingMethod(CGAbstractExternMethod): # we're someone's consequential interface. But for this-unwrapping, we # know that we're the real deal. So fake a descriptor here for # consumption by FailureFatalCastableObjectUnwrapper. - unwrapThis = CGIndenter(CGGeneric( - "this = " + str(CastableObjectUnwrapper( + unwrapThis = str(CastableObjectUnwrapper( FakeCastableDescriptor(self.descriptor), - "obj", self.unwrapFailureCode)) + ";\n")) - return CGList([ self.getThis(), unwrapThis, - self.generate_code() ], "\n").define() - - def getThis(self): - return CGIndenter( + "obj", self.unwrapFailureCode)) + unwrapThis = CGIndenter( CGGeneric("let obj: *JSObject = JS_THIS_OBJECT(cx, vp as *mut JSVal);\n" "if obj.is_null() {\n" " return false as JSBool;\n" "}\n" "\n" - "let this: JS<%s>;" % self.descriptor.concreteType)) + "let this: JS<%s>;\n" + "this = %s;\n" % (self.descriptor.concreteType, unwrapThis))) + return CGList([ unwrapThis, self.generate_code() ], "\n").define() def generate_code(self): assert(False) # Override me -- cgit v1.2.3