diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-20 14:36:17 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-20 14:36:17 +0530 |
| commit | aa35d7721b0e1e7893e48af1eb91bf8ad2495d46 (patch) | |
| tree | afc7ec7421cfa38ad9eddffdb62212fda602cb67 /components/script/dom | |
| parent | 090da52913a47e027a96d4f6a39c56e55b9db811 (diff) | |
| parent | 6f679c124c9dfda02d8ada903f1aed88e028ca34 (diff) | |
| download | servo-aa35d7721b0e1e7893e48af1eb91bf8ad2495d46.tar.gz servo-aa35d7721b0e1e7893e48af1eb91bf8ad2495d46.zip | |
Auto merge of #10076 - servo:rustup, r=larsbergstrom,manishearth
Update to Rust 2016-03-18.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10076)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
| -rw-r--r-- | components/script/dom/bindings/proxyhandler.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs index 3d5a841edb3..31b5f3db2d0 100644 --- a/components/script/dom/bindings/proxyhandler.rs +++ b/components/script/dom/bindings/proxyhandler.rs @@ -57,9 +57,10 @@ pub unsafe extern "C" fn define_property(cx: *mut JSContext, desc: Handle<JSPropertyDescriptor>, result: *mut ObjectOpResult) -> bool { - // FIXME: Workaround for https://github.com/mozilla/rust/issues/13385 + // FIXME: Workaround for https://github.com/rust-lang/rfcs/issues/718 let setter: *const libc::c_void = mem::transmute(desc.get().setter); - let setter_stub: *const libc::c_void = mem::transmute(JS_StrictPropertyStub); + 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; return true; |