diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-06-09 14:31:42 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-06-09 14:31:42 -0600 |
commit | 88c1cdc9fca6568d1075ea9577ac996c5f73b98f (patch) | |
tree | 62f424cf4b6bbf2ba845d583acb15652f3863b67 /components/script | |
parent | da2ea385bad2f9c22c1dc75bd52b32206cf9d9bb (diff) | |
parent | 8e4bfe39a2f6046b315fa12b8ad261ae7b857efd (diff) | |
download | servo-88c1cdc9fca6568d1075ea9577ac996c5f73b98f.tar.gz servo-88c1cdc9fca6568d1075ea9577ac996c5f73b98f.zip |
Auto merge of #6314 - Manishearth:feature_audit, r=mbrubeck
Will post audit report in a bit
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6314)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/clipboard_provider.rs | 2 | ||||
-rw-r--r-- | components/script/dom/imagedata.rs | 2 | ||||
-rw-r--r-- | components/script/dom/storage.rs | 3 | ||||
-rw-r--r-- | components/script/lib.rs | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/components/script/clipboard_provider.rs b/components/script/clipboard_provider.rs index 2b5253f22e8..af67919125b 100644 --- a/components/script/clipboard_provider.rs +++ b/components/script/clipboard_provider.rs @@ -5,7 +5,7 @@ use msg::constellation_msg::ConstellationChan; use msg::constellation_msg::Msg as ConstellationMsg; -use collections::borrow::ToOwned; +use std::borrow::ToOwned; use std::sync::mpsc::channel; pub trait ClipboardProvider { diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index 99dfbc853a7..2748fa1d438 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -12,7 +12,7 @@ use js::jsapi::{JSContext, JSObject}; use js::jsfriendapi::bindgen::{JS_NewUint8ClampedArray, JS_GetUint8ClampedArrayData}; use libc::uint8_t; use std::vec::Vec; -use collections::slice; +use std::slice; use std::ptr; #[dom_struct] diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index 0afad8294ae..0e47e73fd90 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -17,13 +17,12 @@ use dom::window::WindowHelpers; use util::str::DOMString; use page::IterablePage; use net_traits::storage_task::{StorageTask, StorageTaskMsg, StorageType}; +use std::borrow::ToOwned; use std::sync::mpsc::channel; use url::Url; use script_task::{ScriptTask, ScriptMsg, MainThreadRunnable}; -use collections::borrow::ToOwned; - #[dom_struct] pub struct Storage { reflector_: Reflector, diff --git a/components/script/lib.rs b/components/script/lib.rs index 377be0b4e07..afc7e945903 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -25,7 +25,6 @@ extern crate log; extern crate core; extern crate devtools_traits; extern crate cssparser; -extern crate collections; extern crate geom; extern crate html5ever; extern crate encoding; |