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

auto merge of #5358 : Ms2ger/servo/android-path-ext, r=jdm

Browse source
This commit is contained in:
bors-servo 2015-03-25 10:36:57 -06:00
commit da2231a8fa
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/util/lib.rs
View file

@ -13,7 +13,7 @@
#![feature(old_io)] #![feature(old_io)]
#![feature(optin_builtin_traits)] #![feature(optin_builtin_traits)]
#![feature(path)] #![feature(path)]
#![feature(path_ext)] #![cfg_attr(not(target_os = "android"), feature(path_ext))]
#![feature(plugin)] #![feature(plugin)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![feature(std_misc)] #![feature(std_misc)]

3
components/util/resource_files.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::fs::{File, PathExt}; use std::fs::File;
use std::io::{self, Read}; use std::io::{self, Read};
use std::path::PathBuf; use std::path::PathBuf;
@ -15,6 +15,7 @@ pub fn resources_dir_path() -> PathBuf {
pub fn resources_dir_path() -> PathBuf { pub fn resources_dir_path() -> PathBuf {
use opts; use opts;
use std::env; use std::env;
use std::fs::PathExt;
match opts::get().resources_path { match opts::get().resources_path {
Some(ref path) => PathBuf::new(path), Some(ref path) => PathBuf::new(path),