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/file.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/file.rs')
| -rw-r--r-- | components/script/dom/file.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index 482b0aa9478..a592d336fb0 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -8,7 +8,7 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::{JSRef, Temporary}; use dom::bindings::utils::reflect_dom_object; use dom::blob::{Blob, BlobTypeId}; -use servo_util::str::DOMString; +use util::str::DOMString; #[dom_struct] pub struct File { |