chiark / gitweb /
prefs: Simplify parsing code slightly
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 7 Jun 2021 00:07:18 +0000 (01:07 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Mon, 7 Jun 2021 00:19:12 +0000 (01:19 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
cli/otter.rs

index 84dc04d79f8b0412a5b7a8d50785f623b50fca6b..eb20af3ac365b6677fa7af8bdff9d0fa96690531 100644 (file)
@@ -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(()); }