Merge pull request #3438 from servo/rustup

Upgrade Rust

10 files changed, 19 insertions, 18 deletions

diff --git a/components/net/about_loader.rs b/components/net/about_loader.rs
index 3c74a8dd8de..30f34a100ae 100644
--- a/components/net/about_loader.rs
+++ b/components/net/about_loader.rs
@@ -6,8 +6,9 @@ use resource_task::{LoadResponse, Metadata, Done, LoadData, start_sending};
 use file_loader;
 
 use std::os;
+use std::io::fs::PathExtensions;
 use url::Url;
-use StatusOk = http::status::Ok;
+use http::status::Ok as StatusOk;
 
 
 pub fn factory(mut load_data: LoadData, start_chan: Sender<LoadResponse>) {
diff --git a/components/net/data_loader.rs b/components/net/data_loader.rs
index 4d52b8de33f..8044da5ec1e 100644
--- a/components/net/data_loader.rs
+++ b/components/net/data_loader.rs
@@ -37,7 +37,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
         },
         None => ()
     }
-    let parts: Vec<&str> = scheme_data.as_slice().splitn(',', 1).collect();
+    let parts: Vec<&str> = scheme_data.as_slice().splitn(1, ',').collect();
     if parts.len() != 2 {
         start_sending(start_chan, metadata).send(Done(Err("invalid data uri".to_string())));
         return;
@@ -63,7 +63,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
     if is_base64 {
         // FIXME(#2909): It’s unclear what to do with non-alphabet characters,
         // but Acid 3 apparently depends on spaces being ignored.
-        let bytes = bytes.move_iter().filter(|&b| b != ' ' as u8).collect::<Vec<u8>>();
+        let bytes = bytes.into_iter().filter(|&b| b != ' ' as u8).collect::<Vec<u8>>();
         match bytes.as_slice().from_base64() {
             Err(..) => {
                 progress_chan.send(Done(Err("non-base64 data uri".to_string())));
diff --git a/components/net/fetch/cors_cache.rs b/components/net/fetch/cors_cache.rs
index b98874af790..d7021cd7a6b 100644
--- a/components/net/fetch/cors_cache.rs
+++ b/components/net/fetch/cors_cache.rs
@@ -108,7 +108,7 @@ impl BasicCORSCache {
     fn find_entry_by_header<'a>(&'a mut self, request: &CacheRequestDetails, header_name: &str) -> Option<&'a mut CORSCacheEntry> {
         self.cleanup();
         let BasicCORSCache(ref mut buf) = *self;
-        let entry = buf.mut_iter().find(|e| e.origin.scheme == request.origin.scheme &&
+        let entry = buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
                             e.origin.host() == request.origin.host() &&
                             e.origin.port() == request.origin.port() &&
                             e.url == request.destination &&
@@ -121,7 +121,7 @@ impl BasicCORSCache {
         // we can take the method from CORSRequest itself
         self.cleanup();
         let BasicCORSCache(ref mut buf) = *self;
-        let entry = buf.mut_iter().find(|e| e.origin.scheme == request.origin.scheme &&
+        let entry = buf.iter_mut().find(|e| e.origin.scheme == request.origin.scheme &&
                             e.origin.host() == request.origin.host() &&
                             e.origin.port() == request.origin.port() &&
                             e.url == request.destination &&
@@ -136,7 +136,7 @@ impl CORSCache for BasicCORSCache {
     #[allow(dead_code)]
     fn clear (&mut self, request: CacheRequestDetails) {
         let BasicCORSCache(buf) = self.clone();
-        let new_buf: Vec<CORSCacheEntry> = buf.move_iter().filter(|e| e.origin == request.origin && request.destination == e.url).collect();
+        let new_buf: Vec<CORSCacheEntry> = buf.into_iter().filter(|e| e.origin == request.origin && request.destination == e.url).collect();
         *self = BasicCORSCache(new_buf);
     }
 
@@ -144,7 +144,7 @@ impl CORSCache for BasicCORSCache {
     fn cleanup(&mut self) {
         let BasicCORSCache(buf) = self.clone();
         let now = time::now().to_timespec();
-        let new_buf: Vec<CORSCacheEntry> = buf.move_iter().filter(|e| now.sec > e.created.sec + e.max_age as i64).collect();
+        let new_buf: Vec<CORSCacheEntry> = buf.into_iter().filter(|e| now.sec > e.created.sec + e.max_age as i64).collect();
         *self = BasicCORSCache(new_buf);
     }
 
diff --git a/components/net/fetch/request.rs b/components/net/fetch/request.rs
index c14efe9c59e..da933002fb8 100644
--- a/components/net/fetch/request.rs
+++ b/components/net/fetch/request.rs
@@ -79,7 +79,7 @@ pub struct Request {
     pub manual_redirect: bool,
     pub redirect_count: uint,
     pub response_tainting: ResponseTainting,
-    pub cache: Option<Box<CORSCache>>
+    pub cache: Option<Box<CORSCache+'static>>
 }
 
 impl Request {
diff --git a/components/net/fetch/response.rs b/components/net/fetch/response.rs
index 359ec6aa394..3ccb2ffe521 100644
--- a/components/net/fetch/response.rs
+++ b/components/net/fetch/response.rs
@@ -4,7 +4,7 @@
 
 use url::Url;
 use http::status::{Status, UnregisteredStatus};
-use StatusOk = http::status::Ok;
+use http::status::Ok as StatusOk;
 use http::headers::HeaderEnum;
 use http::headers::response::HeaderCollection;
 use std::ascii::OwnedStrAsciiExt;
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 7af4bf2ca00..bde8c9d2b53 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -69,7 +69,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
 
         // Preserve the `host` header set automatically by RequestWriter.
         let host = writer.headers.host.clone();
-        writer.headers = box load_data.headers.clone();
+        writer.headers = load_data.headers.clone();
         writer.headers.host = host;
         if writer.headers.accept_encoding.is_none() {
             // We currently don't support HTTP Compression (FIXME #2587)
@@ -130,7 +130,7 @@ fn load(load_data: LoadData, start_chan: Sender<LoadResponse>) {
 
         let mut metadata = Metadata::default(url);
         metadata.set_content_type(&response.headers.content_type);
-        metadata.headers = Some(*response.headers.clone());
+        metadata.headers = Some(response.headers.clone());
         metadata.status = response.status.clone();
 
         let progress_chan = match start_sending_opt(start_chan, metadata) {
diff --git a/components/net/image/base.rs b/components/net/image/base.rs
index 37f53f509a4..82215be9eb1 100644
--- a/components/net/image/base.rs
+++ b/components/net/image/base.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use std::iter::range_step;
-use stb_image = stb_image::image;
+use stb_image::image as stb_image;
 use png;
 
 // FIXME: Images must not be copied every frame. Instead we should atomically
diff --git a/components/net/image_cache_task.rs b/components/net/image_cache_task.rs
index de0c978c3cf..cf0cb9a0bd2 100644
--- a/components/net/image_cache_task.rs
+++ b/components/net/image_cache_task.rs
@@ -76,7 +76,7 @@ impl<E, S: Encoder<E>> Encodable<S, E> for ImageCacheTask {
     }
 }
 
-type DecoderFactory = fn() -> proc(&[u8]) -> Option<Image>;
+type DecoderFactory = fn() -> (proc(&[u8]) : 'static -> Option<Image>);
 
 impl ImageCacheTask {
     pub fn new(resource_task: ResourceTask) -> ImageCacheTask {
@@ -464,7 +464,7 @@ fn load_image_data(url: Url, resource_task: ResourceTask) -> Result<Vec<u8>, ()>
                 image_data.push_all(data.as_slice());
             }
             resource_task::Done(result::Ok(..)) => {
-                return Ok(image_data.move_iter().collect());
+                return Ok(image_data.into_iter().collect());
             }
             resource_task::Done(result::Err(..)) => {
                 return Err(());
diff --git a/components/net/lib.rs b/components/net/lib.rs
index bdf907e1c1b..32f78840da0 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -14,7 +14,7 @@ extern crate png;
 #[phase(plugin, link)]
 extern crate log;
 extern crate serialize;
-extern crate servo_util = "util";
+extern crate "util" as servo_util;
 extern crate stb_image;
 extern crate sync;
 extern crate time;
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index f25c1efa258..1b6e177350c 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -12,12 +12,12 @@ use http_loader;
 use std::comm::{channel, Receiver, Sender};
 use std::task::TaskBuilder;
 use http::headers::content_type::MediaType;
-use ResponseHeaderCollection = http::headers::response::HeaderCollection;
-use RequestHeaderCollection = http::headers::request::HeaderCollection;
+use http::headers::response::HeaderCollection as ResponseHeaderCollection;
+use http::headers::request::HeaderCollection as RequestHeaderCollection;
 use http::method::{Method, Get};
 use url::Url;
 
-use StatusOk = http::status::Ok;
+use http::status::Ok as StatusOk;
 use http::status::Status;