From 3af31cc0cc2ef5ac31f71372b33970a98d51be58 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sat, 11 Aug 2012 15:53:02 -0700 Subject: [PATCH] arc is in std now --- src/servo/content.rs | 2 +- src/servo/gfx/renderer.rs | 4 ++-- src/servo/layout/base.rs | 2 +- src/servo/layout/display_list.rs | 2 +- src/servo/layout/layout_task.rs | 2 +- src/servo/layout/style/style.rs | 2 +- src/servo/resource/image_cache_task.rs | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/servo/content.rs b/src/servo/content.rs index 53d05a00680..718f9ae36b0 100644 --- a/src/servo/content.rs +++ b/src/servo/content.rs @@ -9,7 +9,7 @@ export PingMsg, PongMsg; export create_content; export Document; -import arc::{arc, clone}; +import std::arc::{arc, clone}; import comm::{port, chan, listen, select2}; import task::{spawn, spawn_listener}; import io::{read_whole_file, println}; diff --git a/src/servo/gfx/renderer.rs b/src/servo/gfx/renderer.rs index 6600c83a8cc..b0c4d3fe605 100644 --- a/src/servo/gfx/renderer.rs +++ b/src/servo/gfx/renderer.rs @@ -14,7 +14,7 @@ import geom::rect::Rect; import geom::point::Point2D; import azure_hl::AsAzureRect; import ptr::addr_of; -import arc::arc; +import std::arc::arc; import azure::cairo::{cairo_font_face_t, cairo_scaled_font_t}; import pipes::{port, chan}; @@ -129,7 +129,7 @@ fn draw_solid_color(draw_target: AzDrawTargetRef, item: dl::display_item, } fn draw_image(draw_target: AzDrawTargetRef, item: dl::display_item, image: arc<~Image>) unsafe { - let image = arc::get(&image); + let image = std::arc::get(&image); let size = Size2D(image.width as i32, image.height as i32); let stride = image.width * 4; diff --git a/src/servo/layout/base.rs b/src/servo/layout/base.rs index d6af5d1b88e..943ed2a761c 100644 --- a/src/servo/layout/base.rs +++ b/src/servo/layout/base.rs @@ -20,7 +20,7 @@ import std::net::url::url; import resource::image_cache_task; import image_cache_task::ImageCacheTask; import core::to_str::to_str; -import arc::{arc, clone}; +import std::arc::{arc, clone}; enum BoxKind { BlockBox, diff --git a/src/servo/layout/display_list.rs b/src/servo/layout/display_list.rs index 035eb9010d1..9e9ef689e21 100644 --- a/src/servo/layout/display_list.rs +++ b/src/servo/layout/display_list.rs @@ -3,7 +3,7 @@ import geom::rect::Rect; import image::base::Image; import servo_text::text_run::TextRun; -import arc::arc; +import std::arc::arc; import dvec::dvec; enum item_type { diff --git a/src/servo/layout/layout_task.rs b/src/servo/layout/layout_task.rs index 3ee70d05766..ff5a35ce178 100644 --- a/src/servo/layout/layout_task.rs +++ b/src/servo/layout/layout_task.rs @@ -3,7 +3,7 @@ rendered. "]; -import arc::arc; +import std::arc::arc; import display_list_builder::build_display_list; import dom::base::Node; import dom::style::Stylesheet; diff --git a/src/servo/layout/style/style.rs b/src/servo/layout/style/style.rs index a3b566fea38..c2a00844ca3 100644 --- a/src/servo/layout/style/style.rs +++ b/src/servo/layout/style/style.rs @@ -1,6 +1,6 @@ #[doc="High-level interface to CSS selector matching."] -import arc::{arc, get, clone}; +import std::arc::{arc, get, clone}; import dom::style::{DisplayType, DisBlock, DisInline, DisNone, Stylesheet, Unit, Auto}; import dom::base::{Element, HTMLDivElement, HTMLHeadElement, HTMLImageElement, Node, NodeKind}; diff --git a/src/servo/resource/image_cache_task.rs b/src/servo/resource/image_cache_task.rs index 0e03af4ba31..500a64e72b3 100644 --- a/src/servo/resource/image_cache_task.rs +++ b/src/servo/resource/image_cache_task.rs @@ -10,8 +10,8 @@ import comm::{chan, port}; import task::{spawn, spawn_listener}; import resource::resource_task; import resource_task::ResourceTask; -import core::arc::arc; -import clone_arc = core::arc::clone; +import std::arc::arc; +import clone_arc = std::arc::clone; enum Msg { /// Tell the cache that we may need a particular image soon. Must be posted