aboutsummaryrefslogtreecommitdiffstats
path: root/components/script_traits
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_traits
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_traits')
-rw-r--r--components/script_traits/lib.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 87f336265a8..ae5e9b22bb6 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -22,6 +22,8 @@ extern crate util;
extern crate url;
use devtools_traits::ScriptToDevtoolsControlMsg;
+use euclid::point::Point2D;
+use euclid::rect::Rect;
use ipc_channel::ipc::{IpcReceiver, IpcSender};
use libc::c_void;
use msg::compositor_msg::{Epoch, LayerId, ScriptToCompositorMsg};
@@ -38,9 +40,6 @@ use std::sync::mpsc::{Receiver, Sender};
use url::Url;
use util::geometry::Au;
-use euclid::point::Point2D;
-use euclid::rect::Rect;
-
/// The address of a node. Layout sends these back. They must be validated via
/// `from_untrusted_node_address` before they can be used, because we do not trust layout.
#[allow(raw_pointer_derive)]