Skip to content

Commit 77cdd97

Browse files
committed
Update to Rust 2016-03-18.
1 parent e551ea7 commit 77cdd97

File tree

10 files changed

+139
-122
lines changed

10 files changed

+139
-122
lines changed

components/plugins/lints/unrooted_must_root.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ fn is_unrooted_ty(cx: &LateContext, ty: &ty::TyS, in_new_function: bool) -> bool
6666
ty::TyBox(..) if in_new_function => false, // box in new() is okay
6767
ty::TyRef(..) => false, // don't recurse down &ptrs
6868
ty::TyRawPtr(..) => false, // don't recurse down *ptrs
69+
ty::TyFnDef(..) | ty::TyFnPtr(_) => false,
6970
_ => true
7071
}
7172
});

components/script/dom/bindings/proxyhandler.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ pub unsafe extern "C" fn define_property(cx: *mut JSContext,
5757
desc: Handle<JSPropertyDescriptor>,
5858
result: *mut ObjectOpResult)
5959
-> bool {
60-
// FIXME: Workaround for https://github.com/mozilla/rust/issues/13385
60+
// FIXME: Workaround for https://github.com/rust-lang/rfcs/issues/718
6161
let setter: *const libc::c_void = mem::transmute(desc.get().setter);
62-
let setter_stub: *const libc::c_void = mem::transmute(JS_StrictPropertyStub);
62+
let setter_stub: unsafe extern fn(_, _, _, _, _) -> _ = JS_StrictPropertyStub;
63+
let setter_stub: *const libc::c_void = mem::transmute(setter_stub);
6364
if (desc.get().attrs & JSPROP_GETTER) != 0 && setter == setter_stub {
6465
(*result).code_ = JSErrNum::JSMSG_GETTER_ONLY as ::libc::uintptr_t;
6566
return true;

components/servo/Cargo.lock

Lines changed: 39 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)