diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 40ffdc42047..9f342b321a9 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -30,6 +30,7 @@ use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo, UnscannedTextFragm use gfx::display_list::OpaqueNode; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, InlineFragmentNodeFlags}; use inline::{InlineFragmentNodeInfo, LAST_FRAGMENT_OF_ELEMENT}; +use linked_list::prepend_from; use list_item::{ListItemFlow, ListStyleTypeContent}; use multicol::{MulticolFlow, MulticolColumnFlow}; use parallel; @@ -57,7 +58,6 @@ use table_wrapper::TableWrapperFlow; use text::TextRunScanner; use traversal::PostorderNodeMutTraversal; use url::Url; -use util::linked_list; use util::opts; use wrapper::{TextContent, ThreadSafeLayoutNodeHelpers}; @@ -1805,8 +1805,7 @@ pub fn strip_ignorable_whitespace_from_start(this: &mut LinkedList) { } } } - linked_list::prepend_from(this, - &mut leading_fragments_consisting_of_solely_bidi_control_characters); + prepend_from(this, &mut leading_fragments_consisting_of_solely_bidi_control_characters); } /// Strips ignorable whitespace from the end of a list of fragments. diff --git a/components/layout/lib.rs b/components/layout/lib.rs index e747993dd84..f05b21c3628 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -75,6 +75,7 @@ mod fragment; mod generated_content; pub mod incremental; mod inline; +mod linked_list; mod list_item; mod model; mod multicol; diff --git a/components/util/linked_list.rs b/components/layout/linked_list.rs similarity index 100% rename from components/util/linked_list.rs rename to components/layout/linked_list.rs diff --git a/components/layout/text.rs b/components/layout/text.rs index 472ef9fcd50..250ad9d5e73 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -16,6 +16,7 @@ use gfx::text::glyph::ByteIndex; use gfx::text::text_run::TextRun; use gfx::text::util::{self, CompressionMode}; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFragments, LAST_FRAGMENT_OF_ELEMENT}; +use linked_list::split_off_head; use range::Range; use std::borrow::ToOwned; use std::collections::LinkedList; @@ -28,7 +29,6 @@ use style::properties::style_structs::ServoFont; use style::properties::{ComputedValues, ServoComputedValues}; use unicode_bidi::{is_rtl, process_text}; use unicode_script::{get_script, Script}; -use util::linked_list::split_off_head; /// Returns the concatenated text of a list of unscanned text fragments. fn text(fragments: &LinkedList) -> String { diff --git a/components/util/lib.rs b/components/util/lib.rs index ff1a18ab712..eed9c3e2a98 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -39,7 +39,6 @@ pub mod cache; #[allow(unsafe_code)] pub mod debug_utils; pub mod geometry; #[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod ipc; -#[cfg(feature = "servo")] pub mod linked_list; #[allow(unsafe_code)] pub mod opts; #[cfg(feature = "servo")] pub mod panicking; pub mod prefs;