Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0-dev.

Browse source
This commit is contained in:
Ms2ger 2015-03-11 11:08:57 +01:00 • committed by Josh Matthews
parent 65d4b12bf2
commit 5f15eb5fbf
140 changed files with 1420 additions and 1222 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/util/resource_files.rs
View file

@ -2,22 +2,22 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::old_io::{File, IoResult};
use std::old_path::Path;
use std::fs::{File, PathExt};
use std::io::{self, Read};
use std::path::PathBuf;
#[cfg(target_os = "android")]
pub fn resources_dir_path() -> Path {
Path::new("/sdcard/servo/")
pub fn resources_dir_path() -> PathBuf {
PathBuf::new("/sdcard/servo/")
}
#[cfg(not(target_os = "android"))]
pub fn resources_dir_path() -> Path {
pub fn resources_dir_path() -> PathBuf {
use opts;
use std::env;
use std::old_io::fs::PathExtensions;
match opts::get().resources_path {
Some(ref path) => Path::new(path),
Some(ref path) => PathBuf::new(path),
None => {
// FIXME: Find a way to not rely on the executable being
// under `<servo source>/components/servo/target`
@ -39,9 +39,13 @@ pub fn resources_dir_path() -> Path {
}
pub fn read_resource_file(relative_path_components: &[&str]) -> IoResult<Vec<u8>> {
pub fn read_resource_file(relative_path_components: &[&str]) -> io::Result<Vec<u8>> {
let mut path = resources_dir_path();
path.push_many(relative_path_components);
for component in relative_path_components {
path.push(component);
}
let mut file = try!(File::open(&path));
file.read_to_end()
let mut data = Vec::new();
try!(file.read_to_end(&mut data));
Ok(data)
}