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;