diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-05 09:11:30 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-05 09:11:30 -0500 |
| commit | 49aed6555dbc008c1a378c5cbb303f5467232b6b (patch) | |
| tree | 9146cdd7126ead59c57cacbaa04eda0f16761f65 /components/util/resource_files.rs | |
| parent | 7b87085c1880c60aa3be5b3ec4572a0d93fd5537 (diff) | |
| parent | ef8edd4e87aeb3cc71dfd9da2f69437080f5410e (diff) | |
| download | servo-49aed6555dbc008c1a378c5cbb303f5467232b6b.tar.gz servo-49aed6555dbc008c1a378c5cbb303f5467232b6b.zip | |
Auto merge of #5935 - servo:rustup_2015-04-25, r=Ms2ger
r? everybody
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5935)
<!-- Reviewable:end -->
Diffstat (limited to 'components/util/resource_files.rs')
| -rw-r--r-- | components/util/resource_files.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/util/resource_files.rs b/components/util/resource_files.rs index f614673946f..7c61a48f0ba 100644 --- a/components/util/resource_files.rs +++ b/components/util/resource_files.rs @@ -8,7 +8,7 @@ use std::path::PathBuf; #[cfg(target_os = "android")] pub fn resources_dir_path() -> PathBuf { - PathBuf::new("/sdcard/servo/") + PathBuf::from("/sdcard/servo/") } #[cfg(not(target_os = "android"))] @@ -18,7 +18,7 @@ pub fn resources_dir_path() -> PathBuf { use std::fs::PathExt; match opts::get().resources_path { - Some(ref path) => PathBuf::new(path), + Some(ref path) => PathBuf::from(path), None => { // FIXME: Find a way to not rely on the executable being // under `<servo source>/components/servo/target` |