diff options
Diffstat (limited to 'components/style/lib.rs')
| -rw-r--r-- | components/style/lib.rs | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/components/style/lib.rs b/components/style/lib.rs index 7479279418d..8a21e15d648 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -50,7 +50,7 @@ extern crate fnv; #[cfg(feature = "gecko")] #[macro_use] pub mod gecko_string_cache; #[cfg(feature = "servo")] extern crate heapsize; #[cfg(feature = "servo")] #[macro_use] extern crate heapsize_derive; -#[cfg(feature = "servo")] #[macro_use] extern crate html5ever_atoms; +#[cfg(feature = "servo")] #[macro_use] extern crate html5ever; #[macro_use] extern crate lazy_static; #[macro_use] @@ -70,6 +70,7 @@ extern crate pdqsort; #[cfg(feature = "gecko")] extern crate precomputed_hash; extern crate rayon; extern crate selectors; +#[cfg(feature = "servo")] extern crate serde; #[cfg(feature = "servo")] #[macro_use] extern crate serde_derive; #[cfg(feature = "servo")] #[macro_use] extern crate servo_atoms; #[cfg(feature = "servo")] extern crate servo_config; @@ -118,6 +119,7 @@ pub mod sequential; pub mod sink; pub mod str; pub mod style_adjuster; +pub mod stylearc; pub mod stylesheet_set; pub mod stylesheets; pub mod supports; @@ -130,7 +132,6 @@ pub mod values; pub mod viewport; use std::fmt; -use std::sync::Arc; use style_traits::ToCss; #[cfg(feature = "gecko")] pub use gecko_string_cache as string_cache; @@ -140,9 +141,9 @@ use style_traits::ToCss; #[cfg(feature = "gecko")] pub use gecko_string_cache::Atom as LocalName; #[cfg(feature = "servo")] pub use servo_atoms::Atom; -#[cfg(feature = "servo")] pub use html5ever_atoms::Prefix; -#[cfg(feature = "servo")] pub use html5ever_atoms::LocalName; -#[cfg(feature = "servo")] pub use html5ever_atoms::Namespace; +#[cfg(feature = "servo")] pub use html5ever::Prefix; +#[cfg(feature = "servo")] pub use html5ever::LocalName; +#[cfg(feature = "servo")] pub use html5ever::Namespace; /// The CSS properties supported by the style system. /// Generated from the properties.mako.rs template by build.rs @@ -175,14 +176,6 @@ macro_rules! reexport_computed_values { } longhand_properties_idents!(reexport_computed_values); -/// Returns whether the two arguments point to the same value. -/// -/// FIXME: Remove this and use Arc::ptr_eq once we require Rust 1.17 -#[inline] -pub fn arc_ptr_eq<T: 'static>(a: &Arc<T>, b: &Arc<T>) -> bool { - ptr_eq::<T>(&**a, &**b) -} - /// Pointer equality /// /// FIXME: Remove this and use std::ptr::eq once we require Rust 1.17 |