Upgrade Rust.

1 files changed, 8 insertions, 8 deletions

diff --git a/src/components/net/image_cache_task.rs b/src/components/net/image_cache_task.rs
index 746ec0d8df0..80c9497b475 100644
--- a/src/components/net/image_cache_task.rs
+++ b/src/components/net/image_cache_task.rs
@@ -36,7 +36,7 @@ pub enum Msg {
 
     // FIXME: We can probably get rid of this Cell now
     /// Used be the prefetch tasks to post back image binaries
-    StorePrefetchedImageData(Url, Result<~[u8], ()>),
+    StorePrefetchedImageData(Url, Result<Vec<u8>, ()>),
 
     /// Used by the decoder tasks to post decoded images back to the cache
     StoreImage(Url, Option<Arc<Box<Image>>>),
@@ -147,7 +147,7 @@ struct ImageCache {
 enum ImageState {
     Init,
     Prefetching(AfterPrefetch),
-    Prefetched(~[u8]),
+    Prefetched(Vec<u8>),
     Decoding,
     Decoded(Arc<Box<Image>>),
     Failed
@@ -270,7 +270,7 @@ impl ImageCache {
         }
     }
 
-    fn store_prefetched_image_data(&mut self, url: Url, data: Result<~[u8], ()>) {
+    fn store_prefetched_image_data(&mut self, url: Url, data: Result<Vec<u8>, ()>) {
         match self.get_state(url.clone()) {
           Prefetching(next_step) => {
             match data {
@@ -318,7 +318,7 @@ impl ImageCache {
                 spawn(proc() {
                     let url = url_clone;
                     debug!("image_cache_task: started image decode for {:s}", url.to_str());
-                    let image = load_from_memory(data);
+                    let image = load_from_memory(data.as_slice());
                     let image = if image.is_some() {
                         Some(Arc::new(box image.unwrap()))
                     } else {
@@ -452,7 +452,7 @@ impl ImageCacheTask {
     }
 }
 
-fn load_image_data(url: Url, resource_task: ResourceTask) -> Result<~[u8], ()> {
+fn load_image_data(url: Url, resource_task: ResourceTask) -> Result<Vec<u8>, ()> {
     let (response_chan, response_port) = channel();
     resource_task.send(resource_task::Load(LoadData::new(url), response_chan));
 
@@ -533,7 +533,7 @@ mod tests {
     impl Closure for SendTestImageErr {
         fn invoke(&self, response: Sender<resource_task::ProgressMsg>) {
             response.send(resource_task::Payload(test_image_bin()));
-            response.send(resource_task::Done(Err("".to_owned())));
+            response.send(resource_task::Done(Err("".to_string())));
         }
     }
 
@@ -559,7 +559,7 @@ mod tests {
             // the image
             self.wait_port.recv();
             response.send(resource_task::Payload(test_image_bin()));
-            response.send(resource_task::Done(Err("".to_owned())));
+            response.send(resource_task::Done(Err("".to_string())));
         }
     }
 
@@ -767,7 +767,7 @@ mod tests {
                     resource_task::Load(_, response) => {
                         let chan = start_sending(response, Metadata::default(parse_url("file:///fake", None)));
                         chan.send(resource_task::Payload(test_image_bin()));
-                        chan.send(resource_task::Done(Err("".to_owned())));
+                        chan.send(resource_task::Done(Err("".to_string())));
                         image_bin_sent_chan.send(());
                     }
                     resource_task::Exit => {