Upgrade to rustc 551a74dddd84cf01440ee84148ebd18bc68bd7c8.

This commit is contained in:
Simon Sapin 2015-04-23 00:14:02 +02:00 committed by Josh Matthews
parent 7b87085c18
commit ef8edd4e87
168 changed files with 2247 additions and 2408 deletions

View file

@ -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`