diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-05 02:04:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-05 02:04:42 -0700 |
commit | bb916bb38bc4298477bfc8134b94dc906054bce1 (patch) | |
tree | 5f592efcb4b1db3836f87e0af31f81aada26912b /components/script | |
parent | 181261004d3b217605cb2d8fbdc00ad0785532ba (diff) | |
parent | 8ecb5962f3c2d2ec1cc031ef1e893ab81142c730 (diff) | |
download | servo-bb916bb38bc4298477bfc8134b94dc906054bce1.tar.gz servo-bb916bb38bc4298477bfc8134b94dc906054bce1.zip |
Auto merge of #12256 - nox:die-util-die, r=Ms2ger
Move some stuff from util to style
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12256)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/document.rs | 2 | ||||
-rw-r--r-- | components/script/dom/domtokenlist.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlcollection.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlfontelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlformelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlinputelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmllinkelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlmetaelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmloptionelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/htmlscriptelement.rs | 2 | ||||
-rw-r--r-- | components/script/dom/window.rs | 2 | ||||
-rw-r--r-- | components/script/layout_wrapper.rs | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 8c3ee29bf1a..2160a3a4556 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -124,11 +124,11 @@ use style::attr::AttrValue; use style::context::ReflowGoal; use style::restyle_hints::ElementSnapshot; use style::servo::Stylesheet; +use style::str::{split_html_space_chars, str_join}; use time; use url::Url; use url::percent_encoding::percent_decode; use util::prefs::PREFS; -use util::str::{split_html_space_chars, str_join}; #[derive(JSTraceable, PartialEq, HeapSizeOf)] pub enum IsHTMLDocument { diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 1fb53e6ce06..364b6366282 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -13,7 +13,7 @@ use dom::bindings::str::DOMString; use dom::element::Element; use dom::node::window_from_node; use string_cache::Atom; -use util::str::HTML_SPACE_CHARACTERS; +use style::str::HTML_SPACE_CHARACTERS; #[dom_struct] pub struct DOMTokenList { diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index bbacf5c7a0d..798d0731b2c 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -17,7 +17,7 @@ use dom::window::Window; use std::ascii::AsciiExt; use std::cell::Cell; use string_cache::{Atom, Namespace, QualName}; -use util::str::split_html_space_chars; +use style::str::split_html_space_chars; pub trait CollectionFilter : JSTraceable { fn filter<'a>(&self, elem: &'a Element, root: &'a Node) -> bool; diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index 5968efc7948..85dd000d183 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/components/script/dom/htmlfontelement.rs @@ -15,8 +15,8 @@ use dom::node::Node; use dom::virtualmethods::VirtualMethods; use string_cache::Atom; use style::attr::AttrValue; +use style::str::{HTML_SPACE_CHARACTERS, read_numbers}; use style::values::specified; -use util::str::{HTML_SPACE_CHARACTERS, read_numbers}; #[dom_struct] pub struct HTMLFontElement { diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 515d49c0f7c..27e954c9abc 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -51,10 +51,10 @@ use std::cell::Cell; use std::sync::mpsc::Sender; use string_cache::Atom; use style::attr::AttrValue; +use style::str::split_html_space_chars; use task_source::TaskSource; use task_source::dom_manipulation::DOMManipulationTask; use url::form_urlencoded; -use util::str::split_html_space_chars; #[derive(JSTraceable, PartialEq, Clone, Copy, HeapSizeOf)] pub struct GenerationId(u32); diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 762c10aa76d..0ee2023e44a 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -42,10 +42,10 @@ use std::ops::Range; use string_cache::Atom; use style::attr::AttrValue; use style::element_state::*; +use style::str::split_commas; use textinput::KeyReaction::{DispatchInput, Nothing, RedrawSelection, TriggerDefaultAction}; use textinput::Lines::Single; use textinput::{TextInput, SelectionDirection}; -use util::str::split_commas; const DEFAULT_SUBMIT_VALUE: &'static str = "Submit"; const DEFAULT_RESET_VALUE: &'static str = "Reset"; diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 0b84bc38501..ed6754afde6 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -40,9 +40,9 @@ use style::attr::AttrValue; use style::media_queries::{MediaQueryList, parse_media_query_list}; use style::parser::ParserContextExtraData; use style::servo::Stylesheet; +use style::str::HTML_SPACE_CHARACTERS; use style::stylesheets::Origin; use url::Url; -use util::str::HTML_SPACE_CHARACTERS; no_jsmanaged_fields!(Stylesheet); diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 3a289b6c1bc..14d8d300bb6 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -21,9 +21,9 @@ use std::sync::Arc; use string_cache::Atom; use style::attr::AttrValue; use style::servo::Stylesheet; +use style::str::HTML_SPACE_CHARACTERS; use style::stylesheets::{CSSRule, Origin}; use style::viewport::ViewportRule; -use util::str::HTML_SPACE_CHARACTERS; #[dom_struct] pub struct HTMLMetaElement { diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index 67cb4983258..7d0eeb45752 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -22,7 +22,7 @@ use dom::virtualmethods::VirtualMethods; use std::cell::Cell; use string_cache::Atom; use style::element_state::*; -use util::str::{split_html_space_chars, str_join}; +use style::str::{split_html_space_chars, str_join}; #[dom_struct] pub struct HTMLOptionElement { diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 5aeb607ee93..e4ce7fb068f 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -38,8 +38,8 @@ use std::cell::Cell; use std::mem; use std::sync::{Arc, Mutex}; use string_cache::Atom; +use style::str::{HTML_SPACE_CHARACTERS, StaticStringVec}; use url::Url; -use util::str::{HTML_SPACE_CHARACTERS, StaticStringVec}; #[dom_struct] pub struct HTMLScriptElement { diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index 4eaa1c6e568..a098edcb43c 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -84,6 +84,7 @@ use style::context::ReflowGoal; use style::error_reporting::ParseErrorReporter; use style::properties::longhands::overflow_x; use style::selector_impl::PseudoElement; +use style::str::HTML_SPACE_CHARACTERS; use task_source::dom_manipulation::DOMManipulationTaskSource; use task_source::file_reading::FileReadingTaskSource; use task_source::history_traversal::HistoryTraversalTaskSource; @@ -96,7 +97,6 @@ use tinyfiledialogs::{self, MessageBoxIcon}; use url::Url; use util::geometry::{self, MAX_RECT}; use util::prefs::PREFS; -use util::str::HTML_SPACE_CHARACTERS; use util::{breakpoint, opts}; use webdriver_handlers::jsval_to_webdriver; diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 779c37a5d52..7085fcae002 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -63,8 +63,8 @@ use style::restyle_hints::ElementSnapshot; use style::selector_impl::{NonTSPseudoClass, ServoSelectorImpl}; use style::servo::{PrivateStyleData, SharedStyleContext}; use style::sink::Push; +use style::str::is_whitespace; use url::Url; -use util::str::is_whitespace; #[derive(Copy, Clone)] pub struct ServoLayoutNode<'a> { |