auto merge of #5381 : Ms2ger/servo/old_path, r=jdm

components/compositing/compositor.rs

@@ -38,7 +38,6 @@ use profile::time::{self, ProfilerCategory, profile};
 use std::cmp;
 use std::collections::HashMap;
 use std::collections::hash_map::Entry::{Occupied, Vacant};
-use std::old_path::Path;
 use std::mem::replace;
 use std::num::Float;
 use std::rc::Rc;
@@ -1131,8 +1130,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
         });
 
         if output_image {
-            let path: Path =
-                opts::get().output_file.as_ref().unwrap().parse().unwrap();
+            let path = opts::get().output_file.as_ref().unwrap();
             let mut pixels = gl::read_pixels(0, 0,
                                              width as gl::GLsizei,
                                              height as gl::GLsizei,

components/compositing/lib.rs

@@ -6,7 +6,6 @@
 #![feature(core)]
 #![feature(int_uint)]
 #![feature(old_io)]
-#![feature(old_path)]
 #![feature(rustc_private)]
 #![feature(std_misc)]
 

components/net/file_loader.rs

@@ -8,6 +8,7 @@ use resource_task::ProgressMsg::{Payload, Done};
 use std::borrow::ToOwned;
 use std::io;
 use std::fs::File;
+use std::path::PathBuf;
 use std::sync::mpsc::Sender;
 use util::task::spawn_named;
 
@@ -37,10 +38,10 @@ pub fn factory(load_data: LoadData, start_chan: Sender<TargetedLoadResponse>) {
     };
     let progress_chan = start_sending(senders, Metadata::default(url.clone()));
     spawn_named("file_loader".to_owned(), move || {
-        let file_path: Result<Path, ()> = url.to_file_path();
+        let file_path: Result<PathBuf, ()> = url.to_file_path();
         match file_path {
             Ok(file_path) => {
-                match File::open(&Path::new(file_path)) {
+                match File::open(&file_path) {
                     Ok(ref mut reader) => {
                         let res = read_all(reader, &progress_chan);
                         progress_chan.send(Done(res)).unwrap();

components/net/lib.rs

@@ -8,7 +8,6 @@
 #![feature(core)]
 #![feature(int_uint)]
 #![feature(io)]
-#![feature(old_path)]
 #![feature(path)]
 #![feature(path_ext)]
 #![feature(plugin)]

components/net/resource_task.rs

@@ -41,7 +41,7 @@ static mut HOST_TABLE: Option<*mut HashMap<String, String>> = None;
 pub fn global_init() {
     //TODO: handle bad file path
     let path = match env::var("HOST_FILE") {
-        Ok(host_file_path) => Path::new(host_file_path),
+        Ok(host_file_path) => host_file_path,
         Err(_) => return,
     };