diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index 817da5043f0..c716be93d39 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -19,7 +19,6 @@ use dom::virtualmethods::VirtualMethods; use dom::window::WindowHelpers; use cssparser::RGBA; -use string_cache::Atom; use util::str::{self, DOMString}; use std::borrow::ToOwned; diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 280a92c99b2..38ed9b26e74 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -26,7 +26,6 @@ use std::ascii::OwnedAsciiExt; use std::borrow::ToOwned; use util::str::DOMString; use std::cell::Cell; -use string_cache::Atom; #[jstraceable] #[derive(PartialEq, Copy, Clone)] diff --git a/components/script/dom/htmldialogelement.rs b/components/script/dom/htmldialogelement.rs index febfbc38f81..6d332530f55 100644 --- a/components/script/dom/htmldialogelement.rs +++ b/components/script/dom/htmldialogelement.rs @@ -14,7 +14,6 @@ use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; -use string_cache::Atom; use std::borrow::ToOwned; diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index 84c6d926bb6..27feed8eb3a 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -20,7 +20,6 @@ use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; use util::str::{DOMString, StaticStringVec}; -use string_cache::Atom; #[dom_struct] pub struct HTMLFieldSetElement { diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 9b12cd20e4e..00390c615cc 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -12,7 +12,6 @@ use dom::element::ElementTypeId; use dom::htmlelement::{HTMLElement, HTMLElementTypeId}; use dom::node::{Node, NodeTypeId}; use util::str::DOMString; -use string_cache::Atom; #[dom_struct] pub struct HTMLMetaElement { diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index bb56ee67092..df2c98ecfda 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -24,7 +24,6 @@ use dom::virtualmethods::VirtualMethods; use net_traits::image::base::Image; use util::str::DOMString; use std::sync::Arc; -use string_cache::Atom; #[dom_struct] pub struct HTMLObjectElement { diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index 4b3f3baf560..f259eccf5bc 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -18,7 +18,6 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use util::str::DOMString; -use string_cache::Atom; #[dom_struct] pub struct HTMLOptGroupElement { diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index 232e5ec2dec..29ef5040641 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -22,7 +22,6 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, NodeTypeId}; use dom::virtualmethods::VirtualMethods; use util::str::{DOMString, split_html_space_chars}; -use string_cache::Atom; #[dom_struct] pub struct HTMLOptionElement { diff --git a/components/script/dom/macros.rs b/components/script/dom/macros.rs index d66190ffada..176feb927b9 100644 --- a/components/script/dom/macros.rs +++ b/components/script/dom/macros.rs @@ -8,8 +8,7 @@ macro_rules! make_getter( fn $attr(self) -> DOMString { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; - #[allow(unused_imports)] - use std::ascii::AsciiExt; + use string_cache::Atom; let element: JSRef = ElementCast::from_ref(self); element.get_string_attribute(&Atom::from_slice($htmlname)) } @@ -25,8 +24,7 @@ macro_rules! make_bool_getter( fn $attr(self) -> bool { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; - #[allow(unused_imports)] - use std::ascii::AsciiExt; + use string_cache::Atom; let element: JSRef = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. element.has_attribute(&Atom::from_slice($htmlname)) @@ -43,8 +41,7 @@ macro_rules! make_uint_getter( fn $attr(self) -> u32 { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; - #[allow(unused_imports)] - use std::ascii::AsciiExt; + use string_cache::Atom; let element: JSRef = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. element.get_uint_attribute(&Atom::from_slice($htmlname), $default) @@ -64,8 +61,7 @@ macro_rules! make_url_getter( fn $attr(self) -> DOMString { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; - #[allow(unused_imports)] - use std::ascii::AsciiExt; + use string_cache::Atom; let element: JSRef = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not runtime. element.get_url_attribute(&Atom::from_slice($htmlname)) @@ -84,8 +80,7 @@ macro_rules! make_url_or_base_getter( use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; use dom::window::WindowHelpers; - #[allow(unused_imports)] - use std::ascii::AsciiExt; + use string_cache::Atom; let element: JSRef = ElementCast::from_ref(self); let url = element.get_url_attribute(&Atom::from_slice($htmlname)); if url.is_empty() { @@ -107,8 +102,7 @@ macro_rules! make_enumerated_getter( fn $attr(self) -> DOMString { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; - #[allow(unused_imports)] - use std::ascii::AsciiExt; + use string_cache::Atom; use std::borrow::ToOwned; let element: JSRef = ElementCast::from_ref(self); let val = element.get_string_attribute(&Atom::from_slice($htmlname)) @@ -133,6 +127,7 @@ macro_rules! make_setter( fn $attr(self, value: DOMString) { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; + use string_cache::Atom; let element: JSRef = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. element.set_string_attribute(&Atom::from_slice($htmlname), value) @@ -146,6 +141,7 @@ macro_rules! make_bool_setter( fn $attr(self, value: bool) { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; + use string_cache::Atom; let element: JSRef = ElementCast::from_ref(self); // FIXME(pcwalton): Do this at compile time, not at runtime. element.set_bool_attribute(&Atom::from_slice($htmlname), value) @@ -159,6 +155,7 @@ macro_rules! make_uint_setter( fn $attr(self, value: u32) { use dom::element::{Element, AttributeHandlers}; use dom::bindings::codegen::InheritTypes::ElementCast; + use string_cache::Atom; let value = if value > 2147483647 { $default } else {