diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-01-29 05:12:49 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-01-29 05:12:49 -0700 |
| commit | 27e0f16407629422b5e047e067d458142372c97e (patch) | |
| tree | 4f3a6a092be4c854201047521453a6efb109def8 /components/script/dom/document.rs | |
| parent | 5f4343e9c25ed4b617738abf299b50e1532df95f (diff) | |
| parent | 505159a46446340b8f0c860d8dc100df8902e2bf (diff) | |
| download | servo-27e0f16407629422b5e047e067d458142372c97e.tar.gz servo-27e0f16407629422b5e047e067d458142372c97e.zip | |
auto merge of #4766 : Ms2ger/servo/util, r=Manishearth
This used to conflict with the util crate from the standard library, which
has long since been removed.
The import in layout has not been changed because of a conflict with the
util mod there.
Diffstat (limited to 'components/script/dom/document.rs')
| -rw-r--r-- | components/script/dom/document.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index d7e9ce0daa2..d2775d3e5aa 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -55,8 +55,8 @@ use dom::range::Range; use dom::treewalker::TreeWalker; use dom::uievent::UIEvent; use dom::window::{Window, WindowHelpers}; -use servo_util::namespace; -use servo_util::str::{DOMString, split_html_space_chars}; +use util::namespace; +use util::str::{DOMString, split_html_space_chars}; use html5ever::tree_builder::{QuirksMode, NoQuirks, LimitedQuirks, Quirks}; use layout_interface::{LayoutChan, Msg}; |