summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-04-15 22:33:28 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-04-22 13:46:50 +0000
commit3ef14993ea9b4b7997a1112a7c1474f5cfedeff4 (patch)
treeca33ed255c2a0595b3c4aee777e7f231a7848257
parent432564d3f3b6e80a8d7bbc44ddebdc7e8fe452a6 (diff)
downloadmullvadvpn-3ef14993ea9b4b7997a1112a7c1474f5cfedeff4.tar.xz
mullvadvpn-3ef14993ea9b4b7997a1112a7c1474f5cfedeff4.zip
Rename `parse_settings` to `load_from_bytes`
-rw-r--r--mullvad-types/src/settings/mod.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs
index edc6de94c6..32190a46cc 100644
--- a/mullvad-types/src/settings/mod.rs
+++ b/mullvad-types/src/settings/mod.rs
@@ -112,7 +112,7 @@ impl Settings {
io::BufReader::new(file)
.read_to_end(&mut settings_bytes)
.map_err(|e| Error::ReadError("Failed to read settings file".to_owned(), e))?;
- Self::parse_settings(&mut settings_bytes).or_else(|e| {
+ Self::load_from_bytes(&mut settings_bytes).or_else(|e| {
log::error!(
"{}",
e.display_chain_with_msg("Failed to parse settings file")
@@ -128,6 +128,11 @@ impl Settings {
}
}
+ pub fn load_from_bytes(bytes: &[u8]) -> Result<Self> {
+ serde_json::from_slice(bytes).map_err(Error::ParseError)
+ }
+
+
/// Serializes the settings and saves them to the file it was loaded from.
fn save(&self) -> Result<()> {
let path = Self::get_settings_path()?;
@@ -162,10 +167,6 @@ impl Settings {
Ok(dir.join(SETTINGS_FILE))
}
- fn parse_settings(bytes: &[u8]) -> Result<Settings> {
- serde_json::from_slice(bytes).map_err(Error::ParseError)
- }
-
pub fn get_account_token(&self) -> Option<String> {
self.account_token.clone()
}