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

Untry

Browse source
This commit is contained in:
Simon Sapin 2017-06-18 13:21:04 +02:00
parent 7af5a7fd54
commit 316cd35767
34 changed files with 261 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/config/prefs.rs
View file

@ -113,7 +113,7 @@ impl Pref {
}
fn from_json(data: Json) -> Result<Pref, ()> {
let value = try!(PrefValue::from_json(data));
let value = PrefValue::from_json(data)?;
Ok(Pref::new_default(value))
}
@ -158,10 +158,10 @@ pub fn default_prefs() -> Preferences {
pub fn read_prefs_from_file<T>(mut file: T)
-> Result<HashMap<String, Pref>, ()> where T: Read {
let json = try!(Json::from_reader(&mut file).or_else(|e| {
let json = Json::from_reader(&mut file).or_else(|e| {
println!("Ignoring invalid JSON in preferences: {:?}.", e);
Err(())
}));
})?;
let mut prefs = HashMap::new();
if let Json::Object(obj) = json {
@ -205,14 +205,14 @@ fn init_user_prefs(path: &mut PathBuf) {
}
fn read_prefs() -> Result<HashMap<String, Pref>, ()> {
let mut path = try!(resources_dir_path().map_err(|_| ()));
let mut path = resources_dir_path().map_err(|_| ())?;
path.push("prefs.json");
let file = try!(File::open(path).or_else(|e| {
let file = File::open(path).or_else(|e| {
writeln!(&mut stderr(), "Error opening preferences: {:?}.", e)
.expect("failed printing to stderr");
Err(())
}));
})?;
read_prefs_from_file(file)
}