Skip to content

Commit 8d42ac8

Browse files
authored
Move modules into Servo (#233)
Signed-off-by: Nico Burns <[email protected]>
1 parent 6a39161 commit 8d42ac8

File tree

6 files changed

+8
-11
lines changed

6 files changed

+8
-11
lines changed

style/lib.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,7 @@ extern crate to_shmem_derive;
7777
#[macro_use]
7878
mod macros;
7979

80-
pub mod animation;
8180
pub mod applicable_declarations;
82-
#[allow(missing_docs)] // TODO.
83-
#[cfg(feature = "servo")]
84-
pub mod attr;
8581
pub mod author_styles;
8682
pub mod bezier;
8783
pub mod bloom;
@@ -96,8 +92,6 @@ pub mod data;
9692
pub mod dom;
9793
pub mod dom_apis;
9894
pub mod driver;
99-
#[cfg(feature = "servo")]
100-
mod encoding_support;
10195
pub mod error_reporting;
10296
pub mod font_face;
10397
pub mod font_metrics;
@@ -165,8 +159,6 @@ pub type Namespace = crate::values::GenericAtomIdent<web_atoms::NamespaceStaticS
165159
#[cfg(feature = "servo")]
166160
#[allow(missing_docs)]
167161
pub type Prefix = crate::values::GenericAtomIdent<web_atoms::PrefixStaticSet>;
168-
#[cfg(feature = "servo")]
169-
mod shadow_parts;
170162

171163
pub use style_traits::arc_slice::ArcSlice;
172164
pub use style_traits::owned_slice::OwnedSlice;
@@ -185,6 +177,8 @@ pub mod gecko;
185177
#[cfg(feature = "servo")]
186178
#[allow(unsafe_code)]
187179
pub mod servo;
180+
#[cfg(feature = "servo")]
181+
pub use servo::{animation, attr};
188182

189183
macro_rules! reexport_computed_values {
190184
( $( { $name: ident } )+ ) => {
File renamed without changes.

style/attr.rs renamed to style/servo/attr.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
//!
77
//! [attr]: https://dom.spec.whatwg.org/#interface-attr
88
9+
use super::shadow_parts::ShadowParts;
910
use crate::color::{parsing::parse_color_keyword, AbsoluteColor};
1011
use crate::properties::PropertyDeclarationBlock;
11-
use crate::shadow_parts::ShadowParts;
1212
use crate::shared_lock::Locked;
1313
use crate::str::str_join;
1414
use crate::str::{read_exponent, read_fraction, HTML_SPACE_CHARACTERS};
File renamed without changes.

style/servo/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@
66
//!
77
//! These get compiled out on a Gecko build.
88
9+
pub mod animation;
10+
#[allow(missing_docs)] // TODO.
11+
pub mod attr;
12+
mod encoding_support;
913
pub mod media_queries;
1014
pub mod restyle_damage;
1115
pub mod selector_parser;
16+
mod shadow_parts;
1217
pub mod url;

style/shadow_parts.rs renamed to style/servo/shadow_parts.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ impl ShadowParts {
140140

141141
#[cfg(test)]
142142
mod tests {
143-
use crate::shadow_parts::parse_mapping_list;
144-
145143
use super::*;
146144

147145
#[test]

0 commit comments

Comments
 (0)