diff options
| author | Jack Moffitt <jack@metajack.im> | 2014-07-21 07:37:24 -0600 |
|---|---|---|
| committer | Jack Moffitt <jack@metajack.im> | 2014-08-02 21:11:47 -0600 |
| commit | b91e6f30e063cbcea4ffd750da8385ce448de797 (patch) | |
| tree | 3e762f7866e29379810ac1e612f7942979e21b87 /src/components/script/dom/bindings/proxyhandler.rs | |
| parent | 8b6f62c195dd7e42d0b6a18f2ced6fa16bc29faa (diff) | |
| download | servo-b91e6f30e063cbcea4ffd750da8385ce448de797.tar.gz servo-b91e6f30e063cbcea4ffd750da8385ce448de797.zip | |
Upgrade Rust.
Diffstat (limited to 'src/components/script/dom/bindings/proxyhandler.rs')
| -rw-r--r-- | src/components/script/dom/bindings/proxyhandler.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/components/script/dom/bindings/proxyhandler.rs b/src/components/script/dom/bindings/proxyhandler.rs index 1a035a26eb2..8b5f130af1c 100644 --- a/src/components/script/dom/bindings/proxyhandler.rs +++ b/src/components/script/dom/bindings/proxyhandler.rs @@ -49,13 +49,13 @@ pub extern fn getPropertyDescriptor(cx: *mut JSContext, proxy: *mut JSObject, id } pub fn defineProperty_(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, - desc: *JSPropertyDescriptor) -> JSBool { + desc: *mut JSPropertyDescriptor) -> JSBool { static JSMSG_GETTER_ONLY: libc::c_uint = 160; unsafe { //FIXME: Workaround for https://github.com/mozilla/rust/issues/13385 - let setter: *libc::c_void = mem::transmute((*desc).setter); - let setter_stub: *libc::c_void = mem::transmute(JS_StrictPropertyStub); + let setter: *const libc::c_void = mem::transmute((*desc).setter); + let setter_stub: *const libc::c_void = mem::transmute(JS_StrictPropertyStub); if ((*desc).attrs & JSPROP_GETTER) != 0 && setter == setter_stub { return JS_ReportErrorFlagsAndNumber(cx, JSREPORT_WARNING | JSREPORT_STRICT | @@ -75,7 +75,7 @@ pub fn defineProperty_(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, } pub extern fn defineProperty(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, - desc: *JSPropertyDescriptor) -> JSBool { + desc: *mut JSPropertyDescriptor) -> JSBool { defineProperty_(cx, proxy, id, desc) } @@ -97,7 +97,7 @@ pub extern fn delete_(cx: *mut JSContext, proxy: *mut JSObject, id: jsid, } } -pub fn _obj_toString(cx: *mut JSContext, className: *libc::c_char) -> *mut JSString { +pub fn _obj_toString(cx: *mut JSContext, className: *const libc::c_char) -> *mut JSString { unsafe { let name = str::raw::from_c_str(className); let nchars = "[object ]".len() + name.len(); @@ -137,7 +137,7 @@ pub fn EnsureExpandoObject(cx: *mut JSContext, obj: *mut JSObject) -> *mut JSObj assert!(is_dom_proxy(obj)); let mut expando = GetExpandoObject(obj); if expando.is_null() { - expando = JS_NewObjectWithGivenProto(cx, ptr::null(), + expando = JS_NewObjectWithGivenProto(cx, ptr::mut_null(), ptr::mut_null(), GetObjectParent(obj)); if expando.is_null() { |