auto merge of #4739 : Manishearth/servo/warning-patrol, r=Ms2ger

13 files changed, 22 insertions, 25 deletions

diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs
index 5df336d3fe5..dd0bf8bf65c 100644
--- a/components/script/dom/bindings/callback.rs
+++ b/components/script/dom/bindings/callback.rs
@@ -51,7 +51,7 @@ pub struct CallbackInterface {
 
 /// A common base class for representing IDL callback function and
 /// callback interface types.
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
 #[derive(Copy, Clone,PartialEq)]
 #[jstraceable]
 struct CallbackObject {
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs
index b768489122d..2551b5178da 100644
--- a/components/script/dom/bindings/js.rs
+++ b/components/script/dom/bindings/js.rs
@@ -175,10 +175,9 @@ impl<T: Reflectable> JS<T> {
     }
 }
 
-#[old_impl_check]
-impl<T: Assignable<U>, U: Reflectable> JS<U> {
+impl<U: Reflectable> JS<U> {
     /// Create a `JS<T>` from any JS-managed pointer.
-    pub fn from_rooted(root: T) -> JS<U> {
+    pub fn from_rooted<T: Assignable<U>>(root: T) -> JS<U> {
         unsafe {
             root.get_js()
         }
@@ -246,10 +245,9 @@ pub struct MutNullableJS<T: Reflectable> {
     ptr: Cell<Option<JS<T>>>
 }
 
-#[old_impl_check]
-impl<T: Assignable<U>, U: Reflectable> MutNullableJS<U> {
+impl<U: Reflectable> MutNullableJS<U> {
     /// Create a new `MutNullableJS`
-    pub fn new(initial: Option<T>) -> MutNullableJS<U> {
+    pub fn new<T: Assignable<U>>(initial: Option<T>) -> MutNullableJS<U> {
         MutNullableJS {
             ptr: Cell::new(initial.map(|initial| {
                 unsafe { initial.get_js() }
@@ -326,16 +324,15 @@ impl<T: Reflectable> JS<T> {
     }
 }
 
-#[old_impl_check]
-impl<From, To> JS<From> {
+impl<From> JS<From> {
     /// Return `self` as a `JS` of another type.
     //XXXjdm It would be lovely if this could be private.
-    pub unsafe fn transmute(self) -> JS<To> {
+    pub unsafe fn transmute<To>(self) -> JS<To> {
         mem::transmute(self)
     }
 
     /// Return `self` as a `JS` of another type.
-    pub unsafe fn transmute_copy(&self) -> JS<To> {
+    pub unsafe fn transmute_copy<To>(&self) -> JS<To> {
         mem::transmute_copy(self)
     }
 }
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 47543b1f61f..2819018cf27 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -47,7 +47,7 @@ use js;
 /// Proxy handler for a WindowProxy.
 pub struct WindowProxyHandler(pub *const libc::c_void);
 
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
 #[jstraceable]
 /// Static data associated with a global object.
 pub struct GlobalStaticData {
@@ -352,7 +352,7 @@ pub fn reflect_dom_object<T: Reflectable>
 
 /// A struct to store a reference to the reflector of a DOM object.
 // Allowing unused_attribute because the lint sometimes doesn't run in order
-#[allow(raw_pointer_deriving, unrooted_must_root, unused_attributes)]
+#[allow(raw_pointer_derive, unrooted_must_root, unused_attributes)]
 #[derive(PartialEq)]
 #[must_root]
 #[servo_lang = "reflector"]
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 2e7be2d05f0..cbe3bcbe63d 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -26,7 +26,7 @@ use js::{JSRESOLVE_QUALIFIED, JSRESOLVE_ASSIGNING};
 
 use std::ptr;
 
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
 #[jstraceable]
 #[privatize]
 pub struct BrowserContext {
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs
index 2e438721b6c..81dd6aeeebe 100644
--- a/components/script/dom/cssstyledeclaration.rs
+++ b/components/script/dom/cssstyledeclaration.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use dom::bindings::codegen::Bindings::CSSStyleDeclarationBinding::{mod, CSSStyleDeclarationMethods};
+use dom::bindings::codegen::Bindings::CSSStyleDeclarationBinding::{self, CSSStyleDeclarationMethods};
 use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast};
 use dom::bindings::error::Error;
 use dom::bindings::error::ErrorResult;
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index d7ebd75f579..0bd5bbe9bad 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -50,7 +50,7 @@ use dom::node::{window_from_node};
 use dom::nodelist::NodeList;
 use dom::virtualmethods::{VirtualMethods, vtable_for};
 use devtools_traits::AttrInfo;
-use style::{mod, SimpleColorAttribute, UnsignedIntegerAttribute};
+use style::{self, SimpleColorAttribute, UnsignedIntegerAttribute};
 use style::{IntegerAttribute, LengthAttribute, matches};
 use servo_util::namespace;
 use servo_util::str::{DOMString, LengthOrPercentageOrAuto};
diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
index c398d605abd..6126af2c56f 100644
--- a/components/script/dom/htmlbodyelement.rs
+++ b/components/script/dom/htmlbodyelement.rs
@@ -4,7 +4,7 @@
 
 use dom::attr::{Attr, AttrHelpers};
 use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
-use dom::bindings::codegen::Bindings::HTMLBodyElementBinding::{mod, HTMLBodyElementMethods};
+use dom::bindings::codegen::Bindings::HTMLBodyElementBinding::{self, HTMLBodyElementMethods};
 use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::codegen::InheritTypes::EventTargetCast;
 use dom::bindings::codegen::InheritTypes::{HTMLBodyElementDerived, HTMLElementCast};
@@ -18,7 +18,7 @@ use dom::node::{Node, NodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 
 use cssparser::RGBA;
-use servo_util::str::{mod, DOMString};
+use servo_util::str::{self, DOMString};
 
 use std::borrow::ToOwned;
 use std::cell::Cell;
diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs
index 9bb04740c58..d5e14f5cafb 100644
--- a/components/script/dom/htmltablecellelement.rs
+++ b/components/script/dom/htmltablecellelement.rs
@@ -13,7 +13,7 @@ use dom::node::NodeTypeId;
 use dom::virtualmethods::VirtualMethods;
 
 use cssparser::RGBA;
-use servo_util::str::{mod, DOMString, LengthOrPercentageOrAuto};
+use servo_util::str::{self, DOMString, LengthOrPercentageOrAuto};
 use std::cell::Cell;
 
 #[derive(Copy, PartialEq, Show)]
diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs
index 46e23a9665a..e16f51d2e8c 100644
--- a/components/script/dom/htmltableelement.rs
+++ b/components/script/dom/htmltableelement.rs
@@ -18,7 +18,7 @@ use dom::node::{Node, NodeHelpers, NodeTypeId};
 use dom::virtualmethods::VirtualMethods;
 
 use cssparser::RGBA;
-use servo_util::str::{mod, DOMString, LengthOrPercentageOrAuto};
+use servo_util::str::{self, DOMString, LengthOrPercentageOrAuto};
 use std::cell::Cell;
 
 #[dom_struct]
diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs
index a24fb8f3317..77404ca19e4 100644
--- a/components/script/dom/htmltablerowelement.rs
+++ b/components/script/dom/htmltablerowelement.rs
@@ -14,7 +14,7 @@ use dom::node::{Node, NodeTypeId};
 use dom::virtualmethods::VirtualMethods;
 
 use cssparser::RGBA;
-use servo_util::str::{mod, DOMString};
+use servo_util::str::{self, DOMString};
 use std::cell::Cell;
 
 #[dom_struct]
diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs
index a061ae97222..70744c5bd9e 100644
--- a/components/script/dom/htmltablesectionelement.rs
+++ b/components/script/dom/htmltablesectionelement.rs
@@ -14,7 +14,7 @@ use dom::node::{Node, NodeTypeId};
 use dom::virtualmethods::VirtualMethods;
 
 use cssparser::RGBA;
-use servo_util::str::{mod, DOMString};
+use servo_util::str::{self, DOMString};
 use std::cell::Cell;
 
 #[dom_struct]
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 2128b0f93f4..40fa4b037b4 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -60,7 +60,7 @@ use std::cell::{Cell, RefCell, Ref, RefMut};
 use std::default::Default;
 use std::iter::{FilterMap, Peekable};
 use std::mem;
-use style::{mod, ComputedValues};
+use style::{self, ComputedValues};
 use std::sync::Arc;
 use uuid;
 use string_cache::QualName;
@@ -2206,7 +2206,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
 /// The address of a node known to be valid. These are sent from script to layout,
 /// and are also used in the HTML parser interface.
 
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
 #[derive(Clone, PartialEq, Eq, Copy)]
 pub struct TrustedNodeAddress(pub *const c_void);
 
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index f1d061bcdb7..62a42ec3cf6 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -36,7 +36,7 @@ use hyper::header::Headers;
 use hyper::header::common::{Accept, ContentLength, ContentType};
 use hyper::header::quality_item::QualityItem;
 use hyper::http::RawStatus;
-use hyper::mime::{mod, Mime};
+use hyper::mime::{self, Mime};
 use hyper::method::Method;
 
 use js::jsapi::{JS_ParseJSON, JSContext};