Update to Rust 2016-03-18.

servo · Mar 18, 2016 · 77cdd97 · 77cdd97
1 parent e551ea7
commit 77cdd97
Show file tree

Hide file tree

Showing 10 changed files with 139 additions and 122 deletions.
diff --git a/components/plugins/lints/unrooted_must_root.rs b/components/plugins/lints/unrooted_must_root.rs
@@ -66,6 +66,7 @@ fn is_unrooted_ty(cx: &LateContext, ty: &ty::TyS, in_new_function: bool) -> bool
             ty::TyBox(..) if in_new_function => false, // box in new() is okay
             ty::TyRef(..) => false, // don't recurse down &ptrs
             ty::TyRawPtr(..) => false, // don't recurse down *ptrs
+            ty::TyFnDef(..) | ty::TyFnPtr(_) => false,
             _ => true
         }
     });

diff --git 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;

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock