servo: Merge #4739 - Fix some warnings (from Manishearth:warning-patrol); r=Ms2ger

Source-Repo: https://github.com/servo/servo
Source-Revision: d373f8dc26239310dec8d2fd66ed72385548cf6f

servo/components/devtools/actors/console.rs

@@ -15,7 +15,7 @@ use servo_msg::constellation_msg::PipelineId;
 
 use collections::BTreeMap;
 use core::cell::RefCell;
-use serialize::json::{mod, Json, ToJson};
+use serialize::json::{self, Json, ToJson};
 use std::io::TcpStream;
 use std::num::Float;
 use std::sync::mpsc::{channel, Sender};

servo/components/devtools/actors/inspector.rs

@@ -12,7 +12,7 @@ use protocol::JsonPacketStream;
 
 use collections::BTreeMap;
 use servo_msg::constellation_msg::PipelineId;
-use serialize::json::{mod, Json, ToJson};
+use serialize::json::{self, Json, ToJson};
 use std::cell::RefCell;
 use std::io::TcpStream;
 use std::sync::mpsc::{channel, Sender};

servo/components/gfx/display_list/mod.rs

@@ -25,7 +25,7 @@ use text::glyph::CharIndex;
 use text::TextRun;
 
 use azure::azure::AzFloat;
-use collections::dlist::{mod, DList};
+use collections::dlist::{self, DList};
 use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D};
 use geom::num::Zero;
 use libc::uintptr_t;
@@ -34,7 +34,7 @@ use servo_msg::compositor_msg::LayerId;
 use servo_net::image::base::Image;
 use servo_util::cursor::Cursor;
 use servo_util::dlist as servo_dlist;
-use servo_util::geometry::{mod, Au, MAX_RECT, ZERO_RECT};
+use servo_util::geometry::{self, Au, MAX_RECT, ZERO_RECT};
 use servo_util::range::Range;
 use servo_util::smallvec::{SmallVec, SmallVec8};
 use std::fmt;

servo/components/gfx/display_list/optimizer.rs

@@ -8,7 +8,7 @@ use display_list::{DisplayItem, DisplayList, StackingContext};
 
 use collections::dlist::DList;
 use geom::rect::Rect;
-use servo_util::geometry::{mod, Au};
+use servo_util::geometry::{self, Au};
 use std::sync::Arc;
 
 /// Transforms a display list to produce a visually-equivalent, but cheaper-to-paint, one.

servo/components/gfx/paint_task.rs

@@ -5,7 +5,7 @@
 //! The task that handles all painting.
 
 use buffer_map::BufferMap;
-use display_list::{mod, StackingContext};
+use display_list::{self, StackingContext};
 use font_cache_task::FontCacheTask;
 use font_context::FontContext;
 use paint_context::PaintContext;

servo/components/layout/block.rs

@@ -32,7 +32,7 @@ use context::LayoutContext;
 use css::node_style::StyledNode;
 use display_list_builder::{BlockFlowDisplayListBuilding, FragmentDisplayListBuilding};
 use floats::{ClearType, FloatKind, Floats, PlacementInfo};
-use flow::{mod, AbsolutePositionInfo, BaseFlow, ForceNonfloatedFlag, FlowClass, Flow};
+use flow::{self, AbsolutePositionInfo, BaseFlow, ForceNonfloatedFlag, FlowClass, Flow};
 use flow::{ImmutableFlowUtils, MutableFlowUtils, PreorderFlowTraversal};
 use flow::{PostorderFlowTraversal, mut_base};
 use flow::{HAS_LEFT_FLOATED_DESCENDANTS, HAS_RIGHT_FLOATED_DESCENDANTS};

servo/components/layout/construct.rs

@@ -31,7 +31,7 @@ use fragment::TableColumnFragmentInfo;
 use fragment::UnscannedTextFragmentInfo;
 use incremental::{RECONSTRUCT_FLOW, RestyleDamage};
 use inline::InlineFlow;
-use list_item::{mod, ListItemFlow};
+use list_item::{self, ListItemFlow};
 use parallel;
 use table_wrapper::TableWrapperFlow;
 use table::TableFlow;
@@ -56,7 +56,7 @@ use std::mem;
 use std::sync::atomic::Ordering;
 use style::computed_values::{caption_side, display, empty_cells, float, list_style_position};
 use style::computed_values::{position};
-use style::{mod, ComputedValues};
+use style::{self, ComputedValues};
 use std::sync::Arc;
 use url::Url;
 

servo/components/layout/css/matching.rs

@@ -5,7 +5,7 @@
 //! High-level interface to CSS selector matching.
 
 use css::node_style::StyledNode;
-use incremental::{mod, RestyleDamage};
+use incremental::{self, RestyleDamage};
 use util::{LayoutDataAccess, LayoutDataWrapper};
 use wrapper::{LayoutElement, LayoutNode, TLayoutNode};
 
@@ -19,7 +19,7 @@ use std::mem;
 use std::hash::{Hash, Hasher, Writer};
 use std::slice::Iter;
 use string_cache::{Atom, Namespace};
-use style::{mod, PseudoElement, ComputedValues, DeclarationBlock, Stylist, TElement, TNode};
+use style::{self, PseudoElement, ComputedValues, DeclarationBlock, Stylist, TElement, TNode};
 use style::{CommonStyleAffectingAttributeMode, CommonStyleAffectingAttributes, cascade};
 use std::sync::Arc;
 

servo/components/layout/display_list_builder.rs

@@ -13,7 +13,7 @@
 use block::BlockFlow;
 use canvas::canvas_paint_task::CanvasMsg::SendPixelContents;
 use context::LayoutContext;
-use flow::{mod, Flow, IS_ABSOLUTELY_POSITIONED, NEEDS_LAYER};
+use flow::{self, Flow, IS_ABSOLUTELY_POSITIONED, NEEDS_LAYER};
 use fragment::{CoordinateSystem, Fragment, IframeFragmentInfo, ImageFragmentInfo};
 use fragment::{ScannedTextFragmentInfo, SpecificFragmentInfo};
 use inline::InlineFlow;
@@ -40,7 +40,7 @@ use servo_msg::constellation_msg::Msg as ConstellationMsg;
 use servo_msg::constellation_msg::ConstellationChan;
 use servo_net::image::holder::ImageHolder;
 use servo_util::cursor::Cursor;
-use servo_util::geometry::{mod, Au, to_px};
+use servo_util::geometry::{self, Au, to_px};
 use servo_util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};
 use servo_util::opts;
 use std::default::Default;

servo/components/layout/fragment.rs

@@ -32,7 +32,7 @@ use serialize::{Encodable, Encoder};
 use servo_msg::constellation_msg::{PipelineId, SubpageId};
 use servo_net::image::holder::ImageHolder;
 use servo_net::local_image_cache::LocalImageCache;
-use servo_util::geometry::{mod, Au, ZERO_POINT};
+use servo_util::geometry::{self, Au, ZERO_POINT};
 use servo_util::logical_geometry::{LogicalRect, LogicalSize, LogicalMargin};
 use servo_util::range::*;
 use servo_util::smallvec::SmallVec;

servo/components/layout/incremental.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 flow::{mod, Flow};
+use flow::{self, Flow};
 use flow::{IS_ABSOLUTELY_POSITIONED};
 
 use std::fmt;

servo/components/layout/layout_task.rs

@@ -8,12 +8,12 @@
 use css::node_style::StyledNode;
 use construct::ConstructionResult;
 use context::{SharedLayoutContext, SharedLayoutContextWrapper};
-use flow::{mod, Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUtils};
+use flow::{self, Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUtils};
 use flow_ref::FlowRef;
 use fragment::{Fragment, FragmentBorderBoxIterator};
 use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAINT};
 use layout_debug;
-use parallel::{mod, UnsafeFlow};
+use parallel::{self, UnsafeFlow};
 use sequential;
 use util::{LayoutDataAccess, LayoutDataWrapper, OpaqueNodeMethods, ToGfxColor};
 use wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode};

servo/components/layout/sequential.rs

@@ -5,7 +5,7 @@
 //! Implements sequential traversals over the DOM and flow trees.
 
 use context::{LayoutContext, SharedLayoutContext};
-use flow::{mod, Flow, ImmutableFlowUtils, MutableFlowUtils, PostorderFlowTraversal};
+use flow::{self, Flow, ImmutableFlowUtils, MutableFlowUtils, PostorderFlowTraversal};
 use flow::{PreorderFlowTraversal};
 use flow_ref::FlowRef;
 use fragment::FragmentBorderBoxIterator;

servo/components/layout/table.rs

@@ -11,7 +11,7 @@ use block::{ISizeConstraintInput, ISizeConstraintSolution};
 use construct::FlowConstructor;
 use context::LayoutContext;
 use floats::FloatKind;
-use flow::{mod, Flow, FlowClass, IMPACTED_BY_LEFT_FLOATS, IMPACTED_BY_RIGHT_FLOATS};
+use flow::{self, Flow, FlowClass, IMPACTED_BY_LEFT_FLOATS, IMPACTED_BY_RIGHT_FLOATS};
 use flow::ImmutableFlowUtils;
 use fragment::{Fragment, FragmentBorderBoxIterator};
 use layout_debug;

servo/components/layout/text.rs

@@ -14,7 +14,7 @@ use gfx::font::{RunMetrics, ShapingFlags, ShapingOptions};
 use gfx::font_context::FontContext;
 use gfx::text::glyph::CharIndex;
 use gfx::text::text_run::TextRun;
-use gfx::text::util::{mod, CompressionMode};
+use gfx::text::util::{self, CompressionMode};
 use servo_util::dlist;
 use servo_util::geometry::Au;
 use servo_util::logical_geometry::{LogicalSize, WritingMode};

servo/components/net/lib.rs

@@ -45,7 +45,7 @@ mod sniffer_task;
 
 /// An implementation of the [Fetch spec](http://fetch.spec.whatwg.org/)
 pub mod fetch {
-    #![allow(dead_code)] // XXXManishearth this is only temporary until the Fetch mod starts being used
+    #![allow(dead_code, unused)] // XXXManishearth this is only temporary until the Fetch mod starts being used
     pub mod request;
     pub mod response;
     pub mod cors_cache;

servo/components/script/cors.rs

@@ -10,7 +10,7 @@
 //! with CORSRequest being expanded into FetchRequest (etc)
 
 use std::ascii::AsciiExt;
-use std::fmt::{mod, Show};
+use std::fmt::{self, Show};
 use std::str::from_utf8;
 use time;
 use time::{now, Timespec};

servo/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 {

servo/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)
     }
 }

servo/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"]

servo/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 {

servo/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;

servo/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};

servo/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;

servo/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)]

servo/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]

servo/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]

servo/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]

servo/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);
 

servo/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};

servo/components/script/script_task.rs

@@ -30,7 +30,7 @@ use dom::eventtarget::{EventTarget, EventTargetHelpers};
 use dom::htmlelement::HTMLElementTypeId;
 use dom::keyboardevent::KeyboardEvent;
 use dom::mouseevent::MouseEvent;
-use dom::node::{mod, Node, NodeHelpers, NodeDamage, NodeTypeId};
+use dom::node::{self, Node, NodeHelpers, NodeDamage, NodeTypeId};
 use dom::window::{Window, WindowHelpers, ScriptHelpers};
 use parse::html::{HTMLInput, parse_html};
 use layout_interface::{ScriptLayoutChan, LayoutChan, ReflowGoal, ReflowQueryType};
@@ -81,7 +81,7 @@ use libc;
 use std::any::Any;
 use std::borrow::ToOwned;
 use std::cell::Cell;
-use std::fmt::{mod, Show};
+use std::fmt::{self, Show};
 use std::mem::replace;
 use std::num::ToPrimitive;
 use std::rc::Rc;

servo/components/script_traits/lib.rs

@@ -40,7 +40,7 @@ use geom::rect::Rect;
 
 /// The address of a node. Layout sends these back. They must be validated via
 /// `from_untrusted_node_address` before they can be used, because we do not trust layout.
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
 #[derive(Copy, Clone)]
 pub struct UntrustedNodeAddress(pub *const c_void);
 unsafe impl Send for UntrustedNodeAddress {}

servo/components/style/values.rs

@@ -53,9 +53,9 @@ pub mod specified {
     use std::fmt;
     use std::fmt::{Formatter, Show};
     use url::Url;
-    use cssparser::{mod, Token, Parser, ToCss, CssStringWriter};
+    use cssparser::{self, Token, Parser, ToCss, CssStringWriter};
     use parser::ParserContext;
-    use text_writer::{mod, TextWriter};
+    use text_writer::{self, TextWriter};
     use servo_util::geometry::Au;
     use super::CSSFloat;
     use super::computed;

servo/components/util/str.rs

@@ -4,7 +4,7 @@
 
 use geometry::Au;
 
-use cssparser::{mod, RGBA, Color};
+use cssparser::{self, RGBA, Color};
 
 use libc::c_char;
 use std::ascii::AsciiExt;