Stop using old_path in net.

This commit is contained in:
Ms2ger 2015-03-26 08:59:33 +01:00
parent b5bc73f5cb
commit 9aa2696641
3 changed files with 4 additions and 4 deletions

View file

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

View file

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

View file

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