diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-03-07 16:04:33 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-03-08 11:43:24 +0100 |
commit | 8527d447ae2047e0d5d54cc70599a895b62a3ee0 (patch) | |
tree | 023de5d446d28c6a232308f8604e17a129ee49c7 /lib/core/libimagstore/src/util.rs | |
parent | 00aa4df88edae1d5eeb3fb365af05f95bd0de3b4 (diff) |
Replace failure with anyhow in complete codebase
This patch was scripted with
sed -i 's/use failure::Error/use anyhow::Error/' $(rg "use failure::Error" -l)
sed -i 's/use failure::Fallible as /use anyhow::/' $(rg "use failure::Fallible" -l)
sed -i 's/failure/anyhow/' $(rg "failure *=" -l)
sed -i 's/format_err!/anyhow!/' $(rg "format_err!" -l)
sed -i 's/use failure::ResultExt/use anyhow::Context/' $(rg "use failure::ResultExt" -l)
sed -i 's/err_msg/anyhow!/' $(rg "use failure::err_msg" -l)
sed -i 's/^anyhow\ *=.*$/anyhow = "1"/' $(rg "anyhow * =" -l)
sed -i 's/^anyhow_derive.*//' $(rg "anyhow_derive" -l)
sed -i 's/extern crate failure/extern crate anyhow/' $(rg "extern crate failure" -l)
sed -i 's/.*extern crate anyhow_derive.*//' $(rg "anyhow_derive" -l)
Some manual changes were added as well, so this patch was not completely
scripted, but mostly.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/core/libimagstore/src/util.rs')
-rw-r--r-- | lib/core/libimagstore/src/util.rs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/core/libimagstore/src/util.rs b/lib/core/libimagstore/src/util.rs index 946cfd94..e113b14c 100644 --- a/lib/core/libimagstore/src/util.rs +++ b/lib/core/libimagstore/src/util.rs @@ -20,10 +20,7 @@ use std::fmt::Write; use toml::Value; -use failure::Fallible as Result; -use failure::ResultExt; - -use libimagerror::errors::ErrorMsg as EM; +use anyhow::Result; #[cfg(feature = "early-panic")] #[macro_export] @@ -55,15 +52,15 @@ pub fn entry_buffer_to_header_content(buf: &str) -> Result<(Value, String)> { header_consumed = true; // do not further process the line } else if !header_consumed { - writeln!(header, "{}", line).context(EM::FormatError)?; + writeln!(header, "{}", line)?; } else if iter.peek().is_some() { - writeln!(content, "{}", line).context(EM::FormatError)?; + writeln!(content, "{}", line)?; } else { - write!(content, "{}", line).context(EM::FormatError)?; + write!(content, "{}", line)?; } } - let h = ::toml::de::from_str(&header).context(EM::TomlDeserError)?; + let h = ::toml::de::from_str(&header)?; Ok((h, content)) } |