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

Fix warnings in util.

Browse source
This commit is contained in:
Ms2ger 2015-02-13 11:42:13 +01:00
parent b25564440d
commit 830e6741c7
9 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/util/resource_files.rs
View file

@ -5,14 +5,6 @@
use std::old_io::{File, IoResult};
use std::old_path::Path;
#[cfg(not(target_os = "android"))]
use opts;
#[cfg(not(target_os = "android"))]
use std::old_io::fs::PathExtensions;
#[cfg(not(target_os = "android"))]
use std::os;
#[cfg(target_os = "android")]
pub fn resources_dir_path() -> Path {
Path::new("/sdcard/servo/")
@ -20,13 +12,18 @@ pub fn resources_dir_path() -> Path {
#[cfg(not(target_os = "android"))]
pub fn resources_dir_path() -> Path {
use opts;
use std::env;
use std::old_io::fs::PathExtensions;
match opts::get().resources_path {
Some(ref path) => Path::new(path),
None => {
// FIXME: Find a way to not rely on the executable being
// under `<servo source>/components/servo/target`
// or `<servo source>/components/servo/target/release`.
let mut path = os::self_exe_path().expect("can't get exe path");
let mut path = env::current_exe().ok().expect("can't get exe path");
path.pop();
path.pop();
path.pop();
path.pop();