Skip to content
This repository was archived by the owner on Nov 12, 2022. It is now read-only.

Commit 2afcfa4

Browse files
author
bors-servo
authored
Auto merge of #444 - AnshulMalik:optional-args, r=jdm
remove optional arguments from NewProxyObject Fixes #441 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/444) <!-- Reviewable:end -->
2 parents f84b87a + ab8fc91 commit 2afcfa4

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/glue.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,7 @@ extern "C" {
219219
pub fn DeleteCompileOptions(aOpts: *mut ReadOnlyCompileOptions);
220220
pub fn NewProxyObject(aCx: *mut JSContext,
221221
aHandler: *const ::libc::c_void, aPriv: HandleValue,
222-
proto: *mut JSObject, parent: *mut JSObject,
223-
call: *mut JSObject, construct: *mut JSObject)
222+
proto: *mut JSObject)
224223
-> *mut JSObject;
225224
pub fn WrapperNew(aCx: *mut JSContext, aObj: HandleObject,
226225
aHandler: *const ::libc::c_void, aClass: *const JSClass,

src/glue_wrappers.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ wrap!(glue: pub fn InvokeHasOwn(handler: *const ::libc::c_void, cx: *mut JSConte
33
wrap!(glue: pub fn CallJitGetterOp(info: *const JSJitInfo, cx: *mut JSContext, thisObj: HandleObject, specializedThis: *mut ::libc::c_void, argc: u32, vp: *mut Value) -> bool);
44
wrap!(glue: pub fn CallJitSetterOp(info: *const JSJitInfo, cx: *mut JSContext, thisObj: HandleObject, specializedThis: *mut ::libc::c_void, argc: u32, vp: *mut Value) -> bool);
55
wrap!(glue: pub fn CallJitMethodOp(info: *const JSJitInfo, cx: *mut JSContext, thisObj: HandleObject, specializedThis: *mut ::libc::c_void, argc: u32, vp: *mut Value) -> bool);
6-
wrap!(glue: pub fn NewProxyObject(aCx: *mut JSContext, aHandler: *const ::libc::c_void, aPriv: HandleValue, proto: *mut JSObject, parent: *mut JSObject, call: *mut JSObject, construct: *mut JSObject) -> *mut JSObject);
6+
wrap!(glue: pub fn NewProxyObject(aCx: *mut JSContext, aHandler: *const ::libc::c_void, aPriv: HandleValue, proto: *mut JSObject) -> *mut JSObject);
77
wrap!(glue: pub fn WrapperNew(aCx: *mut JSContext, aObj: HandleObject, aHandler: *const ::libc::c_void, aClass: *const JSClass, aSingleton: bool) -> *mut JSObject);
88
wrap!(glue: pub fn NewWindowProxy(aCx: *mut JSContext, aObj: HandleObject, aHandler: *const ::libc::c_void) -> *mut JSObject);
99
wrap!(glue: pub fn RUST_JSID_IS_INT(id: HandleId) -> bool);

src/jsglue.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -588,8 +588,7 @@ DeleteCompileOptions(JS::ReadOnlyCompileOptions *aOpts)
588588

589589
JSObject*
590590
NewProxyObject(JSContext* aCx, const void* aHandler, JS::HandleValue aPriv,
591-
JSObject* proto, JSObject* parent, JSObject* call,
592-
JSObject* construct)
591+
JSObject* proto)
593592
{
594593
js::ProxyOptions options;
595594
return js::NewProxyObject(aCx, (js::BaseProxyHandler*)aHandler, aPriv, proto,

0 commit comments

Comments
 (0)