Hoist the LRU cache into its own crate to share it with selectors.

components/lru_cache/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "lru_cache"
+version = "0.0.1"
+authors = ["The Servo Project Developers"]
+license = "MPL-2.0"
+publish = false # We should publish this at some point
+
+[lib]
+name = "lru_cache"
+path = "lib.rs"
+
+[dependencies]
+arrayvec = "0.3.20"

components/lru_cache/lib.rs

@@ -4,6 +4,8 @@
 
 //! A simple LRU cache.
 
+extern crate arrayvec;
+
 use arrayvec::{Array, ArrayVec};
 
 /// A LRU cache using a statically-sized array for storage.

components/selectors/Cargo.toml

@@ -30,6 +30,7 @@ log = "0.3"
 fnv = "1.0"
 malloc_size_of = { path = "../malloc_size_of" }
 malloc_size_of_derive = { path = "../malloc_size_of_derive" }
+lru_cache = { path = "../lru_cache" }
 phf = "0.7.18"
 precomputed-hash = "0.1"
 servo_arc = { path = "../servo_arc" }

components/selectors/lib.rs

@@ -10,6 +10,7 @@
 #[macro_use] extern crate log;
 #[macro_use] extern crate matches;
 extern crate fnv;
+extern crate lru_cache;
 extern crate malloc_size_of;
 #[macro_use] extern crate malloc_size_of_derive;
 extern crate phf;

components/style/Cargo.toml

@@ -48,6 +48,7 @@ itertools = "0.5"
 itoa = "0.3"
 html5ever = {version = "0.19", optional = true}
 lazy_static = "0.2"
+lru_cache = { path = "../lru_cache" }
 log = "0.3"
 malloc_size_of = { path = "../malloc_size_of", optional=true }
 malloc_size_of_derive = { path = "../malloc_size_of_derive", optional=true }

components/style/context.rs

@@ -8,13 +8,13 @@
 #[cfg(feature = "servo")] use animation::PropertyAnimation;
 use app_units::Au;
 use bloom::StyleBloom;
-use cache::{Entry, LRUCache};
 use data::{EagerPseudoStyles, ElementData};
 use dom::{OpaqueNode, TNode, TElement, SendElement};
 use euclid::ScaleFactor;
 use euclid::Size2D;
 use fnv::FnvHashMap;
 use font_metrics::FontMetricsProvider;
+use lru_cache::{Entry, LRUCache};
 #[cfg(feature = "gecko")] use gecko_bindings::structs;
 use parallel::{STACK_SAFETY_MARGIN_KB, STYLE_THREAD_STACK_SIZE_KB};
 #[cfg(feature = "servo")] use parking_lot::RwLock;

components/style/lib.rs

@@ -59,6 +59,7 @@ extern crate itoa;
 extern crate lazy_static;
 #[macro_use]
 extern crate log;
+extern crate lru_cache;
 #[cfg(feature = "gecko")] #[macro_use] extern crate malloc_size_of;
 #[cfg(feature = "gecko")] #[macro_use] extern crate malloc_size_of_derive;
 #[allow(unused_extern_crates)]
@@ -102,7 +103,6 @@ pub mod applicable_declarations;
 #[cfg(feature = "servo")] pub mod attr;
 pub mod bezier;
 pub mod bloom;
-pub mod cache;
 pub mod context;
 pub mod counter_style;
 pub mod custom_properties;

components/style/sharing/mod.rs

@@ -68,9 +68,9 @@ use Atom;
 use applicable_declarations::ApplicableDeclarationBlock;
 use atomic_refcell::{AtomicRefCell, AtomicRefMut};
 use bloom::StyleBloom;
-use cache::{LRUCache, Entry};
 use context::{SelectorFlagsMap, SharedStyleContext, StyleContext};
 use dom::{TElement, SendElement};
+use lru_cache::{LRUCache, Entry};
 use matching::MatchMethods;
 use owning_ref::OwningHandle;
 use properties::ComputedValues;