From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 7 Jun 2021 00:07:18 +0000 (+0100)
Subject: prefs: Simplify parsing code slightly
X-Git-Tag: otter-0.7.0~52
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=14d6ec2c1a47c5ebb954c73ad46934da8b837f4a;p=otter.git

prefs: Simplify parsing code slightly

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/cli/otter.rs b/cli/otter.rs
index 84dc04d7..eb20af3a 100644
--- a/cli/otter.rs
+++ b/cli/otter.rs
@@ -372,8 +372,7 @@ fn main() {
         Err(e) => throw!(AE::from(e).context("open and read")),
         Ok(data) => data,
       };
-      let data = data.parse().context("parse as toml")?;
-      let data = toml_de::from_value(&data).context("parse as preferences")?;
+      let data = toml_de::from_str(&data).context("parse as preferences")?;
       Ok::<_,AE>(Some(data))
     })().context(prefs_path.display().to_string()).context("prefs file")?;
     if_let!{ Some(data) = data; else return Ok(()); }