Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove a workaround for https://github.com/rust-lang/rfcs/issues/718

Browse source
This commit is contained in:
Bastien Orivel 2017-11-01 12:59:23 +01:00
parent 43a4f01647
commit 516857a15d
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/script/dom/bindings/proxyhandler.rs
View file

@ -20,8 +20,7 @@ use js::jsapi::GetStaticPrototype;
use js::jsapi::JS_GetPropertyDescriptorById; use js::jsapi::JS_GetPropertyDescriptorById;
use js::jsapi::MutableHandleObject; use js::jsapi::MutableHandleObject;
use js::jsval::ObjectValue; use js::jsval::ObjectValue;
use libc; use std::ptr;
use std::{mem, ptr};
static JSPROXYSLOT_EXPANDO: u32 = 0; static JSPROXYSLOT_EXPANDO: u32 = 0;
@ -91,11 +90,7 @@ pub unsafe extern "C" fn define_property(cx: *mut JSContext,
desc: Handle<PropertyDescriptor>, desc: Handle<PropertyDescriptor>,
result: *mut ObjectOpResult) result: *mut ObjectOpResult)
-> bool { -> bool {
// FIXME: Workaround for https://github.com/rust-lang/rfcs/issues/718 if (desc.get().attrs & JSPROP_GETTER) != 0 && desc.get().setter == Some(JS_StrictPropertyStub) {
let setter: *const libc::c_void = mem::transmute(desc.get().setter);
let setter_stub: unsafe extern fn(_, _, _, _, _) -> _ = JS_StrictPropertyStub;
let setter_stub: *const libc::c_void = mem::transmute(setter_stub);
if (desc.get().attrs & JSPROP_GETTER) != 0 && setter == setter_stub {
(*result).code_ = JSErrNum::JSMSG_GETTER_ONLY as ::libc::uintptr_t; (*result).code_ = JSErrNum::JSMSG_GETTER_ONLY as ::libc::uintptr_t;
return true; return true;
} }