diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-07-27 22:19:42 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-07-27 22:54:51 +0200 |
| commit | 3a68b9dbf267d775e6334ce30e854a1fb7948080 (patch) | |
| tree | dd2adc894e6bd1c49c3d4d93d4eb0121e95ac70e | |
| parent | e34bcaaa5fbb3637ebdd4ff79af2322997455efa (diff) | |
| download | servo-3a68b9dbf267d775e6334ce30e854a1fb7948080.tar.gz servo-3a68b9dbf267d775e6334ce30e854a1fb7948080.zip | |
Remove an unused argument to needCx and use it in CGCallGenerator.
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 3d88b2ea442..afc7d7ba1e2 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -2114,7 +2114,7 @@ class CGDefineDOMInterfaceMethod(CGAbstractMethod): assert!(global.is_not_null()); assert!(GetProtoObject(cx, global, global).is_not_null());""") -def needCx(returnType, arguments, extendedAttributes, considerTypes): +def needCx(returnType, arguments, considerTypes): return (considerTypes and (typeNeedsCx(returnType, True) or any(typeNeedsCx(a.type) for a in arguments))) @@ -2150,8 +2150,7 @@ class CGCallGenerator(CGThing): name = "&" + name args.append(CGGeneric(name)) - needsCx = (typeNeedsCx(returnType, True) or - any(typeNeedsCx(a.type) for (a, _) in arguments)) + needsCx = needCx(returnType, (a for (a, _) in arguments), True) if not "cx" in argsPre and needsCx: args.prepend(CGGeneric("cx")) @@ -4618,8 +4617,7 @@ class CGNativeMember(ClassMethod): assert self.member.isIdentifierLess() args.insert(0, Argument("JS::Value", "aThisVal")) # And jscontext bits. - if needCx(returnType, argList, self.extendedAttrs, - self.passJSBitsAsNeeded): + if needCx(returnType, argList, self.passJSBitsAsNeeded): args.insert(0, Argument("JSContext*", "cx")) # And if we're static, a global if self.member.isStatic(): |