diff options
| -rw-r--r-- | components/compositing/compositor.rs | 4 | ||||
| -rw-r--r-- | components/compositing/lib.rs | 1 | ||||
| -rw-r--r-- | components/net/file_loader.rs | 5 | ||||
| -rw-r--r-- | components/net/lib.rs | 1 | ||||
| -rw-r--r-- | components/net/resource_task.rs | 2 | ||||
| -rw-r--r-- | tests/contenttest.rs | 28 |
6 files changed, 23 insertions, 18 deletions
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 02f749eb5d8..60bfbdc35e2 100644 --- a/components/compositing/compositor.rs +++ b/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, diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 6ab2e313437..11f702b71d1 100644 --- a/components/compositing/lib.rs +++ b/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)] diff --git a/components/net/file_loader.rs b/components/net/file_loader.rs index e35f195a7a1..c85f23d2d14 100644 --- a/components/net/file_loader.rs +++ b/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(); diff --git a/components/net/lib.rs b/components/net/lib.rs index 4933d64f0e6..17219cdc06b 100644 --- a/components/net/lib.rs +++ b/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)] diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs index 27df208bd6d..c4b55c1836e 100644 --- a/components/net/resource_task.rs +++ b/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, }; diff --git a/tests/contenttest.rs b/tests/contenttest.rs index 77210a8dbd8..3723bd30ee0 100644 --- a/tests/contenttest.rs +++ b/tests/contenttest.rs @@ -7,7 +7,14 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![feature(collections, core, env, io, os, path, rustc_private, std_misc, test)] +#![feature(collections)] +#![feature(core)] +#![feature(exit_status)] +#![feature(old_io)] +#![feature(path)] +#![feature(rustc_private)] +#![feature(std_misc)] +#![feature(test)] extern crate getopts; extern crate test; @@ -16,10 +23,10 @@ use test::{AutoColor, TestOpts, run_tests_console, TestDesc, TestDescAndFn, DynT use test::ShouldPanic; use getopts::{getopts, reqopt}; use std::{str, env}; -use std::old_io::fs; +use std::ffi::OsStr; +use std::fs::read_dir; use std::old_io::Reader; use std::old_io::process::{Command, Ignored, CreatePipe, InheritFd, ExitStatus}; -use std::old_path::Path; use std::thunk::Thunk; #[derive(Clone)] @@ -67,13 +74,14 @@ fn test_options(config: Config) -> TestOpts { } fn find_tests(config: Config) -> Vec<TestDescAndFn> { - let files_res = fs::readdir(&Path::new(config.source_dir)); - let mut files = match files_res { - Ok(files) => files, - _ => panic!("Error reading directory."), - }; - files.retain(|file| file.extension_str() == Some("html") ); - return files.iter().map(|file| make_test(file.display().to_string())).collect(); + read_dir(&config.source_dir) + .ok() + .expect("Error reading directory.") + .filter_map(Result::ok) + .map(|e| e.path()) + .filter(|file| file.extension().map_or(false, |e| e == OsStr::from_str("html"))) + .map(|file| make_test(file.display().to_string())) + .collect() } fn make_test(file: String) -> TestDescAndFn { |