diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-25 10:36:57 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-25 10:36:57 -0600 |
| commit | da2231a8fa4bebc226a11def6784dbf4b08c00bc (patch) | |
| tree | a9a480984c65d7a6a14e6b689ce91b04830f5fe7 | |
| parent | 06d3fc719c58c8a798f8a8fc827ac47385b61c40 (diff) | |
| parent | 56af6a65680056d3d7da7ab255fe38b35563b8de (diff) | |
| download | servo-da2231a8fa4bebc226a11def6784dbf4b08c00bc.tar.gz servo-da2231a8fa4bebc226a11def6784dbf4b08c00bc.zip | |
auto merge of #5358 : Ms2ger/servo/android-path-ext, r=jdm
| -rw-r--r-- | components/util/lib.rs | 2 | ||||
| -rw-r--r-- | components/util/resource_files.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/components/util/lib.rs b/components/util/lib.rs index c9b1c5bb76a..b4fa2b7a5b0 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -13,7 +13,7 @@ #![feature(old_io)] #![feature(optin_builtin_traits)] #![feature(path)] -#![feature(path_ext)] +#![cfg_attr(not(target_os = "android"), feature(path_ext))] #![feature(plugin)] #![feature(rustc_private)] #![feature(std_misc)] diff --git a/components/util/resource_files.rs b/components/util/resource_files.rs index 47967981a61..f614673946f 100644 --- a/components/util/resource_files.rs +++ b/components/util/resource_files.rs @@ -2,7 +2,7 @@ * 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::fs::{File, PathExt}; +use std::fs::File; use std::io::{self, Read}; use std::path::PathBuf; @@ -15,6 +15,7 @@ pub fn resources_dir_path() -> PathBuf { pub fn resources_dir_path() -> PathBuf { use opts; use std::env; + use std::fs::PathExt; match opts::get().resources_path { Some(ref path) => PathBuf::new(path), |