servo: Merge #7662 - Check for multiple import blocks separated by whitespace (from nerith:import); r=frewsxcv

Fixes #7381.

Source-Repo: https://github.com/servo/servo
Source-Revision: a0d3c9223f09757124b1520c4f17e94fa8bbe249

servo/components/msg/compositor_msg.rs

@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use azure::azure_hl::Color;
+use constellation_msg::PipelineId;
 use constellation_msg::{Key, KeyState, KeyModifiers};
 use euclid::Matrix4;
 use euclid::{Size2D, Point2D, Rect};
@@ -12,8 +13,6 @@ use layers::platform::surface::NativeDisplay;
 use std::fmt;
 use std::fmt::{Formatter, Debug};
 
-use constellation_msg::PipelineId;
-
 /// A newtype struct for denoting the age of messages; prevents race conditions.
 #[derive(PartialEq, Eq, Debug, Copy, Clone, PartialOrd, Ord, Deserialize, Serialize)]
 pub struct Epoch(pub u32);

servo/components/msg/webdriver_msg.rs

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use constellation_msg::{PipelineId, SubpageId};
-
 use ipc_channel::ipc::IpcSender;
 use rustc_serialize::json::{Json, ToJson};
 use url::Url;