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 /bin/core/imag-init/src/lib.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 'bin/core/imag-init/src/lib.rs')
-rw-r--r-- | bin/core/imag-init/src/lib.rs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/bin/core/imag-init/src/lib.rs b/bin/core/imag-init/src/lib.rs index c2712956..acb7464d 100644 --- a/bin/core/imag-init/src/lib.rs +++ b/bin/core/imag-init/src/lib.rs @@ -35,7 +35,7 @@ )] extern crate clap; -#[macro_use] extern crate failure; +#[macro_use] extern crate anyhow; #[cfg(test)] extern crate toml; @@ -51,10 +51,10 @@ use std::path::PathBuf; use std::path::Path; use std::process::Command; -use failure::Fallible as Result; -use failure::ResultExt; -use failure::Error; -use failure::err_msg; +use anyhow::Result; +use anyhow::Context; +use anyhow::Error; + use libimagrt::runtime::Runtime; use libimagrt::application::ImagApplication; @@ -120,11 +120,11 @@ pub fn imag_init() -> Result<()> { .map(PathBuf::from) .map(|mut p| { p.push(".imag"); p }) .and_then(|path| if path.exists() { - Err(format_err!("Cannot continue: Path '{}' already exists", path.display())) + Err(anyhow!("Cannot continue: Path '{}' already exists", path.display())) } else { Ok(path) }) - .map_err(|_| err_msg("Failed to retrieve/build path for imag directory."))? + .map_err(|_| anyhow!("Failed to retrieve/build path for imag directory."))? }; { @@ -167,7 +167,7 @@ pub fn imag_init() -> Result<()> { let mut gitignore_path = path.clone(); gitignore_path.push(".gitignore"); gitignore_path.to_str().map(String::from) - }.ok_or_else(|| err_msg("Cannot convert path to string"))?; + }.ok_or_else(|| anyhow!("Cannot convert path to string"))?; OpenOptions::new() .write(true) @@ -181,7 +181,7 @@ pub fn imag_init() -> Result<()> { }) .context("Failed to open new configuration file")?; - let path_str = path.to_str().map(String::from).ok_or_else(|| err_msg("Cannot convert path to string"))?; + let path_str = path.to_str().map(String::from).ok_or_else(|| anyhow!("Cannot convert path to string"))?; let worktree = format!("--work-tree={}", path_str); let gitdir = format!("--git-dir={}/.git", path_str); @@ -197,7 +197,7 @@ pub fn imag_init() -> Result<()> { } else { writeln!(out, "{}", String::from_utf8(output.stderr).expect("No UTF-8 output"))?; if !output.status.success() { - return Err(err_msg("Failed to execute git command")); + return Err(anyhow!("Failed to execute git command")); } } } @@ -214,7 +214,7 @@ pub fn imag_init() -> Result<()> { } else { writeln!(out, "{}", String::from_utf8(output.stderr).expect("No UTF-8 output"))?; if !output.status.success() { - return Err(err_msg("Failed to execute git command")); + return Err(anyhow!("Failed to execute git command")); } } } @@ -230,7 +230,7 @@ pub fn imag_init() -> Result<()> { } else { writeln!(out, "{}", String::from_utf8(output.stderr).expect("No UTF-8 output"))?; if !output.status.success() { - return Err(err_msg("Failed to execute git command")); + return Err(anyhow!("Failed to execute git command")); } } } |