diff options
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/cors.rs | 2 | ||||
-rw-r--r-- | components/script/dom/cssstyledeclaration.rs | 2 | ||||
-rw-r--r-- | components/script/dom/element.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlbodyelement.rs | 4 | ||||
-rw-r--r-- | components/script/dom/htmltablecellelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmltableelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmltablerowelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmltablesectionelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/node.rs | 2 | ||||
-rw-r--r-- | components/script/dom/xmlhttprequest.rs | 2 | ||||
-rw-r--r-- | components/script/script_task.rs | 4 |
11 files changed, 13 insertions, 13 deletions
diff --git a/components/script/cors.rs b/components/script/cors.rs index a770a90e69f..ebc2af7ec76 100644 --- a/components/script/cors.rs +++ b/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}; 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..405d950b7f4 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; 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}; diff --git a/components/script/script_task.rs b/components/script/script_task.rs index 3c1771a8b2d..e41d069094a 100644 --- a/components/script/script_task.rs +++ b/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; |