aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/cors.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-09-19 13:34:51 -0600
committerbors-servo <metajack+bors@gmail.com>2015-09-19 13:34:51 -0600
commita0d3c9223f09757124b1520c4f17e94fa8bbe249 (patch)
tree1dd3e40e5a554466dfb4575758ad15967927d44d /components/script/cors.rs
parent7f2d81933a6158926ff6d03acbc05f191cd5adb3 (diff)
parentde3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (diff)
downloadservo-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/cors.rs')
-rw-r--r--components/script/cors.rs21
1 files changed, 9 insertions, 12 deletions
diff --git a/components/script/cors.rs b/components/script/cors.rs
index 587cdaacf87..4de0a5ad396 100644
--- a/components/script/cors.rs
+++ b/components/script/cors.rs
@@ -9,17 +9,6 @@
//! This library will eventually become the core of the Fetch crate
//! with CORSRequest being expanded into FetchRequest (etc)
-use net_traits::{AsyncResponseListener, ResponseAction, Metadata};
-use network_listener::{NetworkListener, PreInvoke};
-use script_task::ScriptChan;
-
-use std::ascii::AsciiExt;
-use std::borrow::ToOwned;
-use std::cell::RefCell;
-use std::sync::{Arc, Mutex};
-use time;
-use time::{now, Timespec};
-
use hyper::client::Request;
use hyper::header::{AccessControlMaxAge, AccessControlAllowOrigin};
use hyper::header::{AccessControlRequestHeaders, AccessControlAllowHeaders};
@@ -29,7 +18,15 @@ use hyper::header::{Headers, HeaderView};
use hyper::method::Method;
use hyper::mime::{Mime, TopLevel, SubLevel};
use hyper::status::StatusClass::Success;
-
+use net_traits::{AsyncResponseListener, ResponseAction, Metadata};
+use network_listener::{NetworkListener, PreInvoke};
+use script_task::ScriptChan;
+use std::ascii::AsciiExt;
+use std::borrow::ToOwned;
+use std::cell::RefCell;
+use std::sync::{Arc, Mutex};
+use time;
+use time::{now, Timespec};
use unicase::UniCase;
use url::{SchemeData, Url};
use util::mem::HeapSizeOf;