diff options
author | rohan.prinja <rohan.prinja@samsung.com> | 2015-11-03 19:11:01 +0900 |
---|---|---|
committer | rohan.prinja <rohan.prinja@samsung.com> | 2015-11-03 19:11:01 +0900 |
commit | 425c0b85d9d6d414317ee641080e49d912eb21c2 (patch) | |
tree | 8e215276f1bb706e62a4772f53affa96fed1f59d /components/script/dom/urlsearchparams.rs | |
parent | 6e774ea6eb6d719b98f924ab5bd0629d92fb27d0 (diff) | |
download | servo-425c0b85d9d6d414317ee641080e49d912eb21c2.tar.gz servo-425c0b85d9d6d414317ee641080e49d912eb21c2.zip |
make test-tidy happy + fix some merge errors
Diffstat (limited to 'components/script/dom/urlsearchparams.rs')
-rw-r--r-- | components/script/dom/urlsearchparams.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index 8fc3cdb6778..0e3c21679fd 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -10,8 +10,8 @@ use dom::bindings::codegen::UnionTypes::USVStringOrURLSearchParams::{eUSVString, use dom::bindings::error::Fallible; use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; -use dom::bindings::str::USVString; use dom::bindings::reflector::{Reflector, reflect_dom_object}; +use dom::bindings::str::USVString; use encoding::types::EncodingRef; use url::form_urlencoded::{parse, serialize_with_encoding}; use util::str::DOMString; |