Auto merge of #6433 - michaelwu:fix-smup-warnings, r=metajack

Fix some warnings caused by the SM upgrade



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6433)
<!-- Reviewable:end -->

components/script/dom/bindings/callback.rs

@@ -143,7 +143,7 @@ impl CallbackInterface {
 /// Wraps the reflector for `p` into the compartment of `cx`.
 pub fn wrap_call_this_object<T: Reflectable>(cx: *mut JSContext,
                                              p: &T,
-                                             mut rval: MutableHandleObject) {
+                                             rval: MutableHandleObject) {
     rval.set(p.reflector().get_jsobject().get());
     assert!(!rval.get().is_null());
 

components/script/dom/bindings/cell.rs

@@ -8,7 +8,7 @@ use dom::bindings::trace::JSTraceable;
 use js::jsapi::{JSTracer};
 
 use util::task_state;
-use util::task_state::{SCRIPT, IN_GC};
+use util::task_state::SCRIPT;
 
 use std::cell::{BorrowState, RefCell, Ref, RefMut};
 

components/script/dom/bindings/error.rs

@@ -16,7 +16,6 @@ use js::jsapi::{JS_ReportErrorNumber1, JSErrorFormatString, JSExnType};
 use js::jsapi::{JS_SaveFrameChain, JS_RestoreFrameChain};
 use js::jsapi::JSAutoCompartment;
 use js::jsval::UndefinedValue;
-use js::JSFalse;
 
 use libc;
 use std::ffi::CString;

components/script/dom/bindings/js.rs

@@ -28,7 +28,7 @@ use dom::bindings::trace::trace_reflector;
 use dom::bindings::utils::{Reflector, Reflectable};
 use dom::node::Node;
 use js::jsapi::{JSObject, Heap, JSTracer};
-use js::jsval::{JSVal, UndefinedValue};
+use js::jsval::JSVal;
 use layout_interface::TrustedNodeAddress;
 use script_task::STACK_ROOTS;
 

components/script/dom/bindings/proxyhandler.rs

@@ -84,9 +84,9 @@ pub unsafe extern fn delete(cx: *mut JSContext, proxy: HandleObject, id: HandleI
 }
 
 /// Stub for ownPropertyKeys
-pub unsafe extern fn own_property_keys(cx: *mut JSContext,
-                                       proxy: HandleObject,
-                                       props: *mut AutoIdVector) -> u8 {
+pub unsafe extern fn own_property_keys(_cx: *mut JSContext,
+                                       _proxy: HandleObject,
+                                       _props: *mut AutoIdVector) -> u8 {
     // FIXME: implement this
     // https://github.com/servo/servo/issues/6390
     JSTrue

components/script/dom/bindings/refcounted.rs

@@ -65,11 +65,11 @@ impl<T: Reflectable> Trusted<T> {
     /// Create a new `Trusted<T>` instance from an existing DOM pointer. The DOM object will
     /// be prevented from being GCed for the duration of the resulting `Trusted<T>` object's
     /// lifetime.
-    pub fn new(cx: *mut JSContext, ptr: &T, script_chan: Box<ScriptChan + Send>) -> Trusted<T> {
+    pub fn new(_cx: *mut JSContext, ptr: &T, script_chan: Box<ScriptChan + Send>) -> Trusted<T> {
         LIVE_REFERENCES.with(|ref r| {
             let r = r.borrow();
             let live_references = r.as_ref().unwrap();
-            let refcount = live_references.addref(cx, &*ptr as *const T);
+            let refcount = live_references.addref(&*ptr as *const T);
             Trusted {
                 ptr: &*ptr as *const T as *const libc::c_void,
                 refcount: refcount,
@@ -144,7 +144,7 @@ impl LiveDOMReferences {
         });
     }
 
-    fn addref<T: Reflectable>(&self, cx: *mut JSContext, ptr: *const T) -> Arc<Mutex<usize>> {
+    fn addref<T: Reflectable>(&self, ptr: *const T) -> Arc<Mutex<usize>> {
         let mut table = self.table.borrow_mut();
         match table.entry(ptr as *const libc::c_void) {
             Occupied(mut entry) => {
@@ -161,7 +161,7 @@ impl LiveDOMReferences {
     }
 
     /// Unpin the given DOM object if its refcount is 0.
-    pub fn cleanup(cx: *mut JSContext, raw_reflectable: TrustedReference) {
+    pub fn cleanup(raw_reflectable: TrustedReference) {
         let TrustedReference(raw_reflectable) = raw_reflectable;
         LIVE_REFERENCES.with(|ref r| {
             let r = r.borrow();

components/script/dom/bindings/utils.rs

@@ -633,7 +633,7 @@ pub unsafe fn trace_global(tracer: *mut JSTracer, obj: *mut JSObject) {
 }
 
 unsafe extern fn wrap(cx: *mut JSContext,
-                      existing: HandleObject,
+                      _existing: HandleObject,
                       obj: HandleObject)
                       -> *mut JSObject {
     // FIXME terrible idea. need security wrappers

components/script/dom/dedicatedworkerglobalscope.rs

@@ -258,8 +258,7 @@ impl<'a> PrivateDedicatedWorkerGlobalScopeHelpers for &'a DedicatedWorkerGlobalS
                 runnable.handler()
             },
             ScriptMsg::RefcountCleanup(addr) => {
-                let scope = WorkerGlobalScopeCast::from_ref(self);
-                LiveDOMReferences::cleanup(scope.get_cx(), addr);
+                LiveDOMReferences::cleanup(addr);
             }
             ScriptMsg::FireTimer(TimerSource::FromWorker, timer_id) => {
                 let scope = WorkerGlobalScopeCast::from_ref(self);

components/script/dom/document.rs

@@ -1719,7 +1719,7 @@ impl<'a> DocumentMethods for &'a Document {
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-tree-accessors:dom-document-nameditem-filter
-    fn NamedGetter(self, cx: *mut JSContext, name: DOMString, found: &mut bool)
+    fn NamedGetter(self, _cx: *mut JSContext, name: DOMString, found: &mut bool)
                    -> *mut JSObject {
         #[jstraceable]
         struct NamedElementFilter {

components/script/dom/htmlcanvaselement.rs

@@ -26,7 +26,6 @@ use dom::webglrenderingcontext::{WebGLRenderingContext, LayoutCanvasWebGLRenderi
 
 use util::str::{DOMString, parse_unsigned_integer};
 use js::jsapi::{JSContext, HandleValue};
-use js::jsval::JSVal;
 use offscreen_gl_context::GLContextAttributes;
 
 use euclid::size::Size2D;

components/script/dom/htmlstyleelement.rs

@@ -67,7 +67,7 @@ impl<'a> StyleElementHelpers for &'a HTMLStyleElement {
 
         let mq_attribute = element.get_attribute(&ns!(""), &atom!("media"));
         let mq_str = match mq_attribute {
-            Some(a) => String::from_str(&**a.r().value()),
+            Some(a) => String::from(&**a.r().value()),
             None => String::new(),
         };
         let mut css_parser = CssParser::new(&mq_str);

components/script/dom/node.rs

@@ -1046,7 +1046,7 @@ impl<'a> NodeHelpers for &'a Node {
 /// If the given untrusted node address represents a valid DOM node in the given runtime,
 /// returns it.
 #[allow(unsafe_code)]
-pub fn from_untrusted_node_address(runtime: *mut JSRuntime, candidate: UntrustedNodeAddress)
+pub fn from_untrusted_node_address(_runtime: *mut JSRuntime, candidate: UntrustedNodeAddress)
     -> Root<Node> {
     unsafe {
         // https://github.com/servo/servo/issues/6383

components/script/script_task.rs

@@ -780,7 +780,7 @@ impl ScriptTask {
             ScriptMsg::MainThreadRunnableMsg(runnable) =>
                 runnable.handler(self),
             ScriptMsg::RefcountCleanup(addr) =>
-                LiveDOMReferences::cleanup(self.get_cx(), addr),
+                LiveDOMReferences::cleanup(addr),
             ScriptMsg::DocumentLoadsComplete(id) =>
                 self.handle_loads_complete(id),
         }