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 -->

20 files changed, 15 insertions, 26 deletions

diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs
index 5b83f6bc544..ff151be3bb5 100644
--- a/components/devtools/actors/console.rs
+++ b/components/devtools/actors/console.rs
@@ -15,7 +15,7 @@ use devtools_traits::EvaluateJSReply::{StringValue, BooleanValue, ActorValue};
 use devtools_traits::{CachedConsoleMessageTypes, DevtoolScriptControlMsg, PAGE_ERROR, CONSOLE_API};
 use msg::constellation_msg::PipelineId;
 
-use collections::BTreeMap;
+use std::collections::BTreeMap;
 use core::cell::RefCell;
 use rustc_serialize::json::{self, Json, ToJson};
 use std::net::TcpStream;
diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs
index 35025a9c21b..4aee2f1a166 100644
--- a/components/devtools/actors/inspector.rs
+++ b/components/devtools/actors/inspector.rs
@@ -12,7 +12,7 @@ use devtools_traits::DevtoolScriptControlMsg::{GetLayout, ModifyAttribute};
 use actor::{Actor, ActorRegistry};
 use protocol::JsonPacketStream;
 
-use collections::BTreeMap;
+use std::collections::BTreeMap;
 use msg::constellation_msg::PipelineId;
 use rustc_serialize::json::{self, Json, ToJson};
 use std::cell::RefCell;
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index 24def5fe21c..fd3dba4f1be 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -11,14 +11,12 @@
 #![crate_type = "rlib"]
 
 #![feature(box_syntax, core)]
-#![feature(collections)]
 
 #![allow(non_snake_case)]
 
 #[macro_use]
 extern crate log;
 
-extern crate collections;
 extern crate core;
 extern crate devtools_traits;
 extern crate rustc_serialize;
diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs
index a259b4f4ff7..ca2f806b891 100644
--- a/components/gfx/display_list/mod.rs
+++ b/components/gfx/display_list/mod.rs
@@ -26,7 +26,7 @@ use text::TextRun;
 use azure::azure::AzFloat;
 use azure::azure_hl::Color;
 
-use collections::linked_list::{self, LinkedList};
+use std::collections::linked_list::{self, LinkedList};
 use geom::{Point2D, Rect, SideOffsets2D, Size2D, Matrix2D, Matrix4};
 use geom::approxeq::ApproxEq;
 use geom::num::Zero;
@@ -297,7 +297,7 @@ impl StackingContext {
 
             if opts::get().dump_display_list_optimized {
                 println!("**** optimized display list. Tile bounds: {:?}", tile_bounds);
-                display_list.print_items(String::from_str("*"));
+                display_list.print_items("*".to_owned());
             }
 
             // Sort positioned children according to z-index.
@@ -560,7 +560,7 @@ impl StackingContext {
     pub fn print(&self, mut indentation: String) {
         // We cover the case of an empty string.
         if indentation.len() == 0 {
-            indentation = String::from_str("####");
+            indentation = "####".to_owned();
         }
 
         // We grow the indentation by 4 characters if needed.
diff --git a/components/gfx/display_list/optimizer.rs b/components/gfx/display_list/optimizer.rs
index a16907af2c7..07d048c8c9c 100644
--- a/components/gfx/display_list/optimizer.rs
+++ b/components/gfx/display_list/optimizer.rs
@@ -6,7 +6,7 @@
 
 use display_list::{DisplayItem, DisplayList, StackingContext};
 
-use collections::linked_list::LinkedList;
+use std::collections::linked_list::LinkedList;
 use geom::rect::Rect;
 use util::geometry::{self, Au};
 use std::sync::Arc;
diff --git a/components/gfx/lib.rs b/components/gfx/lib.rs
index 561d8b0ccd2..a6b81be8d78 100644
--- a/components/gfx/lib.rs
+++ b/components/gfx/lib.rs
@@ -18,7 +18,6 @@ extern crate log;
 
 extern crate azure;
 #[macro_use] extern crate bitflags;
-extern crate collections;
 extern crate geom;
 extern crate layers;
 extern crate libc;
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 2ac426776a0..a4040e6dedf 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -17,7 +17,6 @@ use layout_debug;
 use model::IntrinsicISizesContribution;
 use text;
 
-use collections::VecDeque;
 use geom::{Point2D, Rect, Size2D};
 use gfx::display_list::OpaqueNode;
 use gfx::font::FontMetrics;
@@ -25,6 +24,7 @@ use gfx::font_context::FontContext;
 use gfx::text::glyph::CharIndex;
 use gfx::text::text_run::TextRun;
 use std::cmp::max;
+use std::collections::VecDeque;
 use std::fmt;
 use std::mem;
 use std::sync::Arc;
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index 59cdbf6bca0..4dad51374c6 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -861,7 +861,7 @@ impl LayoutTask {
 
                 if opts::get().dump_display_list {
                     println!("#### start printing display list.");
-                    stacking_context.print(String::from_str("#"));
+                    stacking_context.print("#".to_owned());
                 }
 
                 rw_data.stacking_context = Some(stacking_context.clone());
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 66ba28c5523..612060bf61d 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -10,7 +10,6 @@
 #![feature(plugin)]
 #![feature(std_misc)]
 #![feature(str_char)]
-#![feature(thread_local)]
 #![feature(unsafe_no_drop_flag)]
 
 #![deny(unsafe_code)]
@@ -40,7 +39,6 @@ extern crate alloc;
 extern crate azure;
 extern crate canvas_traits;
 extern crate clock_ticks;
-extern crate collections;
 extern crate cssparser;
 extern crate encoding;
 extern crate geom;
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs
index c16f5e9597b..e99d9047c0f 100644
--- a/components/net/image_cache_task.rs
+++ b/components/net/image_cache_task.rs
@@ -2,11 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use collections::borrow::ToOwned;
 use net_traits::image::base::{Image, load_from_memory};
 use net_traits::image_cache_task::{ImageState, ImageCacheTask, ImageCacheChan, ImageCacheCommand};
 use net_traits::image_cache_task::{ImageCacheResult, ImageResponse, UsePlaceholder};
 use net_traits::load_whole_resource;
+use std::borrow::ToOwned;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
 use std::mem;
diff --git a/components/net/lib.rs b/components/net/lib.rs
index a69787276a1..5f5123c6106 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -15,7 +15,6 @@
 extern crate net_traits;
 extern crate cookie as cookie_rs;
 extern crate devtools_traits;
-extern crate collections;
 extern crate flate2;
 extern crate geom;
 extern crate hyper;
diff --git a/components/profile/lib.rs b/components/profile/lib.rs
index 93665b440f9..22d7aa22224 100644
--- a/components/profile/lib.rs
+++ b/components/profile/lib.rs
@@ -9,7 +9,6 @@
 
 #[macro_use] extern crate log;
 
-extern crate collections;
 extern crate libc;
 #[macro_use]
 extern crate profile_traits;
diff --git a/components/profile/time.rs b/components/profile/time.rs
index 464796006fa..133b48c09c1 100644
--- a/components/profile/time.rs
+++ b/components/profile/time.rs
@@ -4,10 +4,10 @@
 
 //! Timing functions.
 
-use collections::BTreeMap;
 use profile_traits::time::{ProfilerCategory, ProfilerChan, ProfilerMsg, TimerMetadata};
 use std::borrow::ToOwned;
 use std::cmp::Ordering;
+use std::collections::BTreeMap;
 use std::f64;
 use std::sync::mpsc::{channel, Receiver};
 use std::thread::sleep_ms;
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;
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 8afb4e90b69..0ac0519a81c 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -16,7 +16,6 @@
 //
 // The `Browser` is fed events from a generic type that implements the
 // `WindowMethods` trait.
-#![feature(thread_local)]
 
 extern crate compositing;
 extern crate devtools;
diff --git a/components/style/lib.rs b/components/style/lib.rs
index 31d55f708be..104dda149aa 100644
--- a/components/style/lib.rs
+++ b/components/style/lib.rs
@@ -15,7 +15,6 @@
 #[macro_use] extern crate log;
 #[macro_use] extern crate bitflags;
 
-extern crate collections;
 extern crate geom;
 extern crate url;
 
diff --git a/components/util/deque/mod.rs b/components/util/deque/mod.rs
index fc79d9f76ee..bee1d97b296 100644
--- a/components/util/deque/mod.rs
+++ b/components/util/deque/mod.rs
@@ -50,8 +50,8 @@
 
 pub use self::Stolen::{Empty, Abort, Data};
 
-use alloc::arc::Arc;
-use alloc::heap::{allocate, deallocate};
+use std::sync::Arc;
+use std::rt::heap::{allocate, deallocate};
 use std::marker;
 use std::mem::{forget, min_align_of, size_of, transmute};
 use std::ptr;