4 files changed, 17 insertions, 17 deletions

diff --git a/src/components/net/image/holder.rs b/src/components/net/image/holder.rs
index bf56b6413e3..096c07b2f19 100644
--- a/src/components/net/image/holder.rs
+++ b/src/components/net/image/holder.rs
@@ -8,18 +8,18 @@ use local_image_cache::LocalImageCache;
 
 use std::util::replace;
 use geom::size::Size2D;
-use extra::net::url::Url;
-use extra::arc::ARC;
+use extra::url::Url;
+use extra::arc::Arc;
 
 // FIXME: Nasty coupling here This will be a problem if we want to factor out image handling from
 // the network stack. This should probably be factored out into an interface and use dependency
 // injection.
 
 /// A struct to store image data. The image will be loaded once the first time it is requested,
-/// and an ARC will be stored.  Clones of this ARC are given out on demand.
+/// and an Arc will be stored.  Clones of this Arc are given out on demand.
 pub struct ImageHolder {
     url: Url,
-    image: Option<ARC<~Image>>,
+    image: Option<Arc<~Image>>,
     cached_size: Size2D<int>,
     local_image_cache: @mut LocalImageCache,
 }
@@ -65,7 +65,7 @@ impl ImageHolder {
         }
     }
 
-    pub fn get_image(&mut self) -> Option<ARC<~Image>> {
+    pub fn get_image(&mut self) -> Option<Arc<~Image>> {
         debug!("get_image() %?", self.url);
 
         // If this is the first time we've called this function, load
diff --git a/src/components/net/image_cache_task.rs b/src/components/net/image_cache_task.rs
index f81e3fb960d..558f31de200 100644
--- a/src/components/net/image_cache_task.rs
+++ b/src/components/net/image_cache_task.rs
@@ -13,8 +13,8 @@ use std::task::spawn;
 use std::to_str::ToStr;
 use std::util::replace;
 use std::result;
-use extra::arc::ARC;
-use extra::net::url::Url;
+use extra::arc::Arc;
+use extra::url::Url;
 
 pub enum Msg {
     /// Tell the cache that we may need a particular image soon. Must be posted
@@ -29,7 +29,7 @@ pub enum Msg {
     Decode(Url),
 
     /// Used by the decoder tasks to post decoded images back to the cache
-    priv StoreImage(Url, Option<ARC<~Image>>),
+    priv StoreImage(Url, Option<Arc<~Image>>),
 
     /// Request an Image object for a URL. If the image is not is not immediately
     /// available then ImageNotReady is returned.
@@ -46,7 +46,7 @@ pub enum Msg {
 }
 
 pub enum ImageResponseMsg {
-    ImageReady(ARC<~Image>),
+    ImageReady(Arc<~Image>),
     ImageNotReady,
     ImageFailed
 }
@@ -163,7 +163,7 @@ enum ImageState {
     Prefetching(AfterPrefetch),
     Prefetched(@Cell<~[u8]>),
     Decoding,
-    Decoded(@ARC<~Image>),
+    Decoded(@Arc<~Image>),
     Failed
 }
 
@@ -257,7 +257,7 @@ impl ImageCache {
                     let image = load_image_data(url.clone(), resource_task.clone());
 
                     let result = if image.is_ok() {
-                        Ok(Cell::new(result::unwrap(image)))
+                        Ok(Cell::new(image.unwrap()))
                     } else {
                         Err(())
                     };
@@ -329,7 +329,7 @@ impl ImageCache {
                     debug!("image_cache_task: started image decode for %s", url.to_str());
                     let image = decode(data);
                     let image = if image.is_some() {
-                        Some(ARC(~image.unwrap()))
+                        Some(Arc::new(~image.unwrap()))
                     } else {
                         None
                     };
@@ -346,7 +346,7 @@ impl ImageCache {
         }
     }
 
-    priv fn store_image(&self, url: Url, image: Option<ARC<~Image>>) {
+    priv fn store_image(&self, url: Url, image: Option<Arc<~Image>>) {
 
         match self.get_state(url.clone()) {
           Decoding => {
diff --git a/src/components/net/local_image_cache.rs b/src/components/net/local_image_cache.rs
index 5555c35aa5f..2c0685bf326 100644
--- a/src/components/net/local_image_cache.rs
+++ b/src/components/net/local_image_cache.rs
@@ -15,7 +15,7 @@ use std::comm;
 use std::comm::Port;
 use std::task;
 use servo_util::url::{UrlMap, url_map};
-use extra::net::url::Url;
+use extra::url::Url;
 
 pub fn LocalImageCache(image_cache_task: ImageCacheTask) -> LocalImageCache {
     LocalImageCache {
@@ -109,7 +109,7 @@ impl LocalImageCache {
                 // on the image to load and triggering layout
                 let image_cache_task = self.image_cache_task.clone();
                 assert!(self.on_image_available.is_some());
-                let on_image_available = self.on_image_available.get()();
+                let on_image_available = self.on_image_available.unwrap()();
                 let url = (*url).clone();
                 do task::spawn {
                     let (response_port, response_chan) = comm::stream();
diff --git a/src/components/net/resource_task.rs b/src/components/net/resource_task.rs
index 0b74e614627..d941bbb8132 100644
--- a/src/components/net/resource_task.rs
+++ b/src/components/net/resource_task.rs
@@ -9,7 +9,7 @@ use http_loader;
 
 use std::cell::Cell;
 use std::comm::{Chan, Port, SharedChan};
-use extra::net::url::{Url, to_str};
+use extra::url::Url;
 use util::spawn_listener;
 
 pub enum ControlMsg {
@@ -94,7 +94,7 @@ impl ResourceManager {
 
         match self.get_loader_factory(&url) {
             Some(loader_factory) => {
-                debug!("resource_task: loading url: %s", to_str(&url));
+                debug!("resource_task: loading url: %s", url.to_str());
                 loader_factory(url, progress_chan);
             }
             None => {