move to anyhow

easybill · Jul 5, 2023 · a4b6727 · a4b6727
1 parent 6bf878e
commit a4b6727
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/mehsh_common/Cargo.toml b/mehsh_common/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["timglabisch <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-toml = "0.5"
+toml = "0.*"
 anyhow = "*"
 serde = { version = "1.0", features = ["derive"] }
-bytes = "0.5.3"
+bytes = "1.4.0"
 rand = "*"
diff --git a/mehsh_common/src/config/mod.rs b/mehsh_common/src/config/mod.rs
@@ -5,6 +5,7 @@ use std::collections::HashMap;
 use std::fs::File;
 use std::io::Read;
 use std::path::PathBuf;
+use anyhow::Context;
 
 mod allow_addr;
 
@@ -156,7 +157,9 @@ impl Config {
         self_server_identifier: ServerIdentifier,
         content: &[u8],
     ) -> Result<Self, ::anyhow::Error> {
-        let raw_config = toml::from_slice::<RawConfig>(content)?;
+        let raw_config = toml::from_str::<RawConfig>(
+            String::from_utf8(content.to_vec()).context("could not read toml, invalid utf8")?.as_str()
+        )?;
 
         let servers = raw_config
             .server