aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/cors.rs
diff options
context:
space:
mode:
authorBrandon Fairchild <csbit32@gmail.com>2015-09-17 17:55:01 -0400
committerBrandon Fairchild <csbit32@gmail.com>2015-09-19 12:50:14 -0400
commitde3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (patch)
tree1dd3e40e5a554466dfb4575758ad15967927d44d /components/script/cors.rs
parente924393be8cce6cb16d3af5a13ed9f634670f843 (diff)
downloadservo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.tar.gz
servo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.zip
Fix reported test-tidy errors for unmerged import blocks
This merges import blocks that were reported by tidy as unmerged.
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;