Eliminate servo_util::atom

We only needed this for Encodable, and now we use JSTraceable instead.
servo · Sep 30, 2014 · 6429750 · 6429750
1 parent 4be0a07
commit 6429750
Show file tree

Hide file tree

Showing 39 changed files with 77 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
@@ -39,3 +39,9 @@ git = "https://github.com/servo/rust-geom"
 
 [dependencies.url]
 git = "https://github.com/servo/rust-url"
+
+[dependencies.string_cache]
+git = "https://github.com/servo/string-cache"
+
+[dependencies.string_cache_macros]
+git = "https://github.com/servo/string-cache"
diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs
@@ -11,7 +11,6 @@ use util::{LayoutDataAccess, LayoutDataWrapper};
 use wrapper::{LayoutElement, LayoutNode, PostorderNodeMutTraversal, ThreadSafeLayoutNode, TLayoutNode};
 
 use script::dom::node::{TextNodeTypeId};
-use servo_util::atom::Atom;
 use servo_util::bloom::BloomFilter;
 use servo_util::cache::{Cache, LRUCache, SimpleHashCache};
 use servo_util::namespace::Null;
@@ -24,6 +23,7 @@ use style;
 use style::{After, Before, ComputedValues, DeclarationBlock, Stylist, TElement, TNode};
 use style::cascade;
 use sync::Arc;
+use string_cache::Atom;
 
 pub struct ApplicableDeclarations {
     pub normal: SmallVec16<DeclarationBlock>,

diff --git a/components/layout/lib.rs b/components/layout/lib.rs
@@ -28,6 +28,9 @@ extern crate "net" as servo_net;
 extern crate "msg" as servo_msg;
 #[phase(plugin, link)]
 extern crate "util" as servo_util;
+extern crate string_cache;
+#[phase(plugin)]
+extern crate string_cache_macros;
 
 extern crate collections;
 extern crate encoding;

diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
@@ -48,7 +48,6 @@ use script::dom::node::{LayoutNodeHelpers, RawLayoutNodeHelpers, SharedLayoutDat
 use script::dom::text::Text;
 use script::layout_interface::LayoutChan;
 use servo_msg::constellation_msg::{PipelineId, SubpageId};
-use servo_util::atom::Atom;
 use servo_util::namespace::Namespace;
 use servo_util::namespace;
 use servo_util::str::is_whitespace;
@@ -59,6 +58,7 @@ use style::computed_values::{content, display, white_space};
 use style::{AnyNamespace, AttrSelector, PropertyDeclarationBlock, SpecificNamespace, TElement};
 use style::{TNode};
 use url::Url;
+use string_cache::Atom;
 
 /// Allows some convenience methods on generic layout nodes.
 pub trait TLayoutNode {

diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
@@ -60,3 +60,9 @@ git = "https://github.com/servo/rust-url"
 
 [dependencies.uuid]
 git = "https://github.com/rust-lang/uuid"
+
+[dependencies.string_cache]
+git = "https://github.com/servo/string-cache"
+
+[dependencies.string_cache_macros]
+git = "https://github.com/servo/string-cache"
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs
@@ -15,13 +15,13 @@ use dom::window::Window;
 use dom::virtualmethods::vtable_for;
 
 use devtools_traits::AttrInfo;
-use servo_util::atom::Atom;
 use servo_util::namespace;
 use servo_util::namespace::Namespace;
 use servo_util::str::{DOMString, split_html_space_chars};
 use std::cell::{Ref, RefCell};
 use std::mem;
 use std::slice::Items;
+use string_cache::Atom;
 
 pub enum AttrSettingType {
     FirstSetAttr,

diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
@@ -35,14 +35,14 @@ use std::rc::Rc;
 use std::cell::{Cell, RefCell};
 
 use url::Url;
-use servo_util::atom::Atom;
 use servo_util::namespace::Namespace;
 use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData};
 use net::image_cache_task::ImageCacheTask;
 use script_traits::ScriptControlChan;
 use std::collections::hashmap::HashMap;
 use collections::hash::Hash;
 use style::PropertyDeclarationBlock;
+use string_cache::Atom;
 
 impl<T: Reflectable> JSTraceable for JS<T> {
     fn trace(&self, trc: *mut JSTracer) {

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
@@ -55,10 +55,10 @@ use dom::window::{Window, WindowHelpers};
 use html::hubbub_html_parser::build_element_from_tag;
 use hubbub::hubbub::{QuirksMode, NoQuirks, LimitedQuirks, FullQuirks};
 use layout_interface::{DocumentDamageLevel, ContentChangedDocumentDamage};
-use servo_util::atom::Atom;
 use servo_util::namespace;
 use servo_util::namespace::{Namespace, Null};
 use servo_util::str::{DOMString, split_html_space_chars};
+use string_cache::Atom;
 
 use std::collections::hashmap::HashMap;
 use std::ascii::StrAsciiExt;

diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs
@@ -12,9 +12,9 @@ use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object};
 use dom::element::{Element, AttributeHandlers};
 use dom::node::window_from_node;
 
-use servo_util::atom::Atom;
 use servo_util::namespace::Null;
 use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
@@ -34,14 +34,14 @@ use layout_interface::MatchSelectorsDocumentDamage;
 use devtools_traits::AttrInfo;
 use style::{matches, parse_selector_list_from_str};
 use style;
-use servo_util::atom::Atom;
 use servo_util::namespace;
 use servo_util::namespace::{Namespace, Null};
 use servo_util::str::DOMString;
 
 use std::ascii::StrAsciiExt;
 use std::cell::{Cell, RefCell};
 use std::mem;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs
@@ -17,8 +17,8 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs
@@ -16,8 +16,8 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, wind
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
@@ -18,8 +18,8 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::{DOMString, parse_unsigned_integer};
+use string_cache::Atom;
 
 use geom::size::Size2D;
 

diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs
@@ -12,11 +12,11 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
 use dom::element::{Element, AttributeHandlers, ElementHelpers};
 use dom::node::{Node, NodeHelpers};
 use dom::window::Window;
-use servo_util::atom::Atom;
 use servo_util::namespace::Namespace;
 use servo_util::str::{DOMString, split_html_space_chars};
 
 use std::ascii::StrAsciiExt;
+use string_cache::Atom;
 
 pub trait CollectionFilter : JSTraceable {
     fn filter(&self, elem: JSRef<Element>, root: JSRef<Node>) -> bool;

diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
@@ -17,9 +17,9 @@ use dom::eventtarget::{EventTarget, EventTargetHelpers, NodeTargetTypeId};
 use dom::node::{Node, ElementNodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::namespace;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs
@@ -18,8 +18,8 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, wind
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::{DOMString, StaticStringVec};
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
@@ -23,9 +23,9 @@ use page::IterablePage;
 use servo_msg::constellation_msg::{PipelineId, SubpageId};
 use servo_msg::constellation_msg::{IFrameSandboxed, IFrameUnsandboxed};
 use servo_msg::constellation_msg::{ConstellationChan, LoadIframeUrlMsg};
-use servo_util::atom::Atom;
 use servo_util::namespace::Null;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 use std::ascii::StrAsciiExt;
 use std::cell::Cell;

diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
@@ -17,9 +17,9 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, ElementNodeTypeId, NodeHelpers, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use servo_net::image_cache_task;
-use servo_util::atom::Atom;
 use servo_util::geometry::to_px;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 use url::{Url, UrlParser};
 

diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
@@ -15,8 +15,8 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
@@ -15,12 +15,12 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{Node, NodeHelpers, ElementNodeTypeId, window_from_node};
 use dom::virtualmethods::VirtualMethods;
 use layout_interface::{LayoutChan, LoadStylesheetMsg};
-use servo_util::atom::Atom;
 use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
 use servo_util::namespace::Null;
 
 use std::ascii::StrAsciiExt;
 use url::UrlParser;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs
@@ -20,9 +20,9 @@ use dom::virtualmethods::VirtualMethods;
 
 use servo_net::image_cache_task;
 use servo_net::image_cache_task::ImageCacheTask;
-use servo_util::atom::Atom;
 use servo_util::namespace::Null;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 use url::Url;
 

diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs
@@ -15,8 +15,8 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs
@@ -19,9 +19,9 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::namespace;
 use servo_util::str::{DOMString, split_html_space_chars};
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
@@ -18,8 +18,8 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, wind
 use dom::validitystate::ValidityState;
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/htmlserializer.rs b/components/script/dom/htmlserializer.rs
@@ -18,8 +18,8 @@ use dom::node::{TextNodeTypeId, NodeHelpers};
 use dom::processinginstruction::ProcessingInstruction;
 use dom::text::Text;
 
-use servo_util::atom::Atom;
 use servo_util::namespace;
+use string_cache::Atom;
 
 #[allow(unrooted_must_root)]
 pub fn serialize(iterator: &mut NodeIterator) -> String {

diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
@@ -15,8 +15,8 @@ use dom::htmlelement::HTMLElement;
 use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId};
 use dom::virtualmethods::VirtualMethods;
 
-use servo_util::atom::Atom;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 #[jstraceable]
 #[must_root]

diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs
@@ -57,8 +57,8 @@ use dom::htmlstyleelement::HTMLStyleElement;
 use dom::htmltextareaelement::HTMLTextAreaElement;
 use dom::node::{Node, NodeHelpers, ElementNodeTypeId};
 
-use servo_util::atom::Atom;
 use servo_util::str::DOMString;
+use string_cache::Atom;
 
 /// Trait to allow DOM nodes to opt-in to overriding (or adding to) common
 /// behaviours. Replicates the effect of C++ virtual methods.

diff --git a/components/script/html/hubbub_html_parser.rs b/components/script/html/hubbub_html_parser.rs
@@ -25,7 +25,6 @@ use encoding::types::{Encoding, DecodeReplace};
 use hubbub::hubbub;
 use hubbub::hubbub::{NullNs, HtmlNs, MathMlNs, SvgNs, XLinkNs, XmlNs, XmlNsNs};
 use servo_net::resource_task::{Load, LoadData, Payload, Done, ResourceTask, load_whole_resource};
-use servo_util::atom::Atom;
 use servo_util::namespace;
 use servo_util::namespace::{Namespace, Null};
 use servo_util::str::DOMString;
@@ -37,6 +36,7 @@ use std::comm::{channel, Sender, Receiver};
 use url::{Url, UrlParser};
 use http::headers::HeaderEnum;
 use time;
+use string_cache::Atom;
 
 macro_rules! handle_element(
     ($document: expr,

diff --git a/components/script/lib.rs b/components/script/lib.rs
@@ -42,6 +42,9 @@ extern crate sync;
 extern crate "msg" as servo_msg;
 extern crate url;
 extern crate uuid;
+extern crate string_cache;
+#[phase(plugin)]
+extern crate string_cache_macros;
 
 pub mod cors;
 

diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml
@@ -29,3 +29,9 @@ git = "https://github.com/lifthrasiir/rust-encoding"
 
 [dependencies.lazy_static]
 git = "https://github.com/Kimundi/lazy-static.rs"
+
+[dependencies.string_cache]
+git = "https://github.com/servo/string-cache"
+
+[dependencies.string_cache_macros]
+git = "https://github.com/servo/string-cache"
diff --git a/components/style/lib.rs b/components/style/lib.rs
@@ -22,6 +22,11 @@ extern crate url;
 
 extern crate cssparser;
 extern crate encoding;
+extern crate string_cache;
+
+#[phase(plugin)]
+extern crate string_cache_macros;
+
 #[phase(plugin)]
 extern crate lazy_static;