diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-09-19 13:34:51 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-09-19 13:34:51 -0600 |
| commit | a0d3c9223f09757124b1520c4f17e94fa8bbe249 (patch) | |
| tree | 1dd3e40e5a554466dfb4575758ad15967927d44d /components/script/dom/urlhelper.rs | |
| parent | 7f2d81933a6158926ff6d03acbc05f191cd5adb3 (diff) | |
| parent | de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (diff) | |
| download | servo-a0d3c9223f09757124b1520c4f17e94fa8bbe249.tar.gz servo-a0d3c9223f09757124b1520c4f17e94fa8bbe249.zip | |
Auto merge of #7662 - nerith:import, r=frewsxcv
Check for multiple import blocks separated by whitespace
Fixes #7381.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7662)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/urlhelper.rs')
| -rw-r--r-- | components/script/dom/urlhelper.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/components/script/dom/urlhelper.rs b/components/script/dom/urlhelper.rs index 684d6666e0c..61d81890fdf 100644 --- a/components/script/dom/urlhelper.rs +++ b/components/script/dom/urlhelper.rs @@ -3,13 +3,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use dom::bindings::str::USVString; - -use url::{Url, UrlParser, SchemeData}; - -use url::urlutils::{UrlUtils, UrlUtilsWrapper}; - use std::borrow::ToOwned; use std::fmt::Write; +use url::urlutils::{UrlUtils, UrlUtilsWrapper}; +use url::{Url, UrlParser, SchemeData}; #[derive(HeapSizeOf)] pub struct UrlHelper; |