diff options
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 3 | ||||
| -rw-r--r-- | mullvad-daemon/src/settings.rs | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index 972a74e9ae..e5a56bf4f0 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -320,7 +320,8 @@ impl RelaySelector { ); let (last_modified, file) = Self::read_file(path.as_ref()).chain_err(|| ErrorKind::RelayCacheError)?; - let relay_list = serde_json::from_reader(file).chain_err(|| ErrorKind::SerializationError)?; + let relay_list = serde_json::from_reader(io::BufReader::new(file)) + .chain_err(|| ErrorKind::SerializationError)?; Ok((last_modified, relay_list)) } diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs index d0023b59c1..9bf7245e03 100644 --- a/mullvad-daemon/src/settings.rs +++ b/mullvad-daemon/src/settings.rs @@ -62,9 +62,9 @@ impl Settings { pub fn load() -> Result<Settings> { let settings_path = Self::get_settings_path()?; match File::open(&settings_path) { - Ok(mut file) => { + Ok(file) => { info!("Loading settings from {}", settings_path.to_string_lossy()); - Self::read_settings(&mut file) + Self::read_settings(&mut io::BufReader::new(file)) } Err(ref e) if e.kind() == io::ErrorKind::NotFound => { info!( @@ -93,7 +93,7 @@ impl Settings { Ok(dir.join(SETTINGS_FILE)) } - fn read_settings(file: &mut File) -> Result<Settings> { + fn read_settings<T: io::Read>(file: &mut T) -> Result<Settings> { serde_json::from_reader(file).chain_err(|| ErrorKind::ParseError) } |