anyhow usage consistency

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs b/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs
index 0ed27296bba7a45268382b52c374794a1e8ed2a8..97b5746046fff0a1d5ed66b9523741aa9dc497ce 100644 (file)
--- a/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs
+++ b/proxmox-auto-installer/src/bin/proxmox-auto-installer.rs
@@ -1,4 +1,4 @@
-use anyhow::{anyhow, bail, Error, Result};
+use anyhow::{bail, format_err, Result};
 use log::{error, info, LevelFilter};
 use std::{
     env,
@@ -26,7 +26,7 @@ pub fn init_log() -> Result<()> {
     AutoInstLogger::init("/tmp/auto_installer.log")?;
     log::set_logger(&LOGGER)
         .map(|()| log::set_max_level(LevelFilter::Info))
-        .map_err(|err| anyhow!(err))
+        .map_err(|err| format_err!(err))
 }
 
 fn auto_installer_setup(in_test_mode: bool) -> Result<(Answer, UdevInfo)> {
@@ -40,7 +40,8 @@ fn auto_installer_setup(in_test_mode: bool) -> Result<(Answer, UdevInfo)> {
         let mut path = path.clone();
         path.push("run-env-udev.json");
 
-        read_json(&path).map_err(|err| anyhow!("Failed to retrieve udev info details: {err}"))?
+        read_json(&path)
+            .map_err(|err| format_err!("Failed to retrieve udev info details: {err}"))?
     };
 
     let mut buffer = String::new();
@@ -51,7 +52,7 @@ fn auto_installer_setup(in_test_mode: bool) -> Result<(Answer, UdevInfo)> {
     }
 
     let answer: Answer =
-        toml::from_str(&buffer).map_err(|err| anyhow!("Failed parsing answer file: {err}"))?;
+        toml::from_str(&buffer).map_err(|err| format_err!("Failed parsing answer file: {err}"))?;
 
     Ok((answer, udev_info))
 }
@@ -137,15 +138,15 @@ fn run_installation(
             .stdout
             .take()
             .map(BufReader::new)
-            .ok_or(anyhow!("failed to get stdout reader"))?;
+            .ok_or(format_err!("failed to get stdout reader"))?;
         let mut writer = child
             .stdin
             .take()
-            .ok_or(anyhow!("failed to get stdin writer"))?;
+            .ok_or(format_err!("failed to get stdin writer"))?;
 
         serde_json::to_writer(&mut writer, &config)
-            .map_err(|err| anyhow!("failed to serialize install config: {err}"))?;
-        writeln!(writer).map_err(|err| anyhow!("failed to write install config: {err}"))?;
+            .map_err(|err| format_err!("failed to serialize install config: {err}"))?;
+        writeln!(writer).map_err(|err| format_err!("failed to write install config: {err}"))?;
 
         for line in reader.lines() {
             let line = match line {
@@ -184,12 +185,7 @@ fn run_installation(
         }
         Ok(())
     };
-    match inner() {
-        Err(err) => Err(Error::msg(format!(
-            "low level installer returned early: {err}"
-        ))),
-        _ => Ok(()),
-    }
+    inner().map_err(|err| format_err!("low level installer returned early: {err}"))
 }
 
 fn run_postinstallation(answer: &Answer) {

diff --git a/proxmox-fetch-answer/src/fetch_plugins/http.rs b/proxmox-fetch-answer/src/fetch_plugins/http.rs
index 11641e82f8d86c9106d1d152a08cc223a9838fd4..d691aea719f1361b14a6ad122688b4b2f9d67ff8 100644 (file)
--- a/proxmox-fetch-answer/src/fetch_plugins/http.rs
+++ b/proxmox-fetch-answer/src/fetch_plugins/http.rs
@@ -1,4 +1,4 @@
-use anyhow::{bail, Error, Result};
+use anyhow::{bail, Result};
 use log::info;
 use std::{
     fs::{self, read_to_string},
@@ -81,7 +81,7 @@ impl FetchFromHTTP {
                 }
             }
         }
-        Err(Error::msg("Could not find search domain in resolv.conf."))
+        bail!("Could not find search domain in resolv.conf.");
     }
 
     /// Runs a TXT DNS query on the domain provided

diff --git a/proxmox-fetch-answer/src/fetch_plugins/partition.rs b/proxmox-fetch-answer/src/fetch_plugins/partition.rs
index e8e256b7fbfab4a15f47b3907998c7271068b418..335bb4713e21876d771346392356f874dd546a68 100644 (file)
--- a/proxmox-fetch-answer/src/fetch_plugins/partition.rs
+++ b/proxmox-fetch-answer/src/fetch_plugins/partition.rs
@@ -1,4 +1,4 @@
-use anyhow::{format_err, Error, Result};
+use anyhow::{bail, format_err, Result};
 use log::{info, warn};
 use std::{
     fs::{self, create_dir_all},
@@ -56,9 +56,7 @@ fn scan_partlabels(partlabel_source: &str, search_path: &str) -> Result<PathBuf>
         Ok(false) => info!("Did not detect partition with label '{partlabel}'"),
         Err(err) => info!("Encountered issue, accessing '{path:?}': {err}"),
     }
-    Err(Error::msg(format!(
-        "Could not detect upper or lower case labels for '{partlabel_source}'"
-    )))
+    bail!("Could not detect upper or lower case labels for '{partlabel_source}'");
 }
 
 /// Will search and mount a partition/FS labeled PARTLABEL (proxmox-inst-src) in lower or uppercase
@@ -86,7 +84,7 @@ fn mount_proxmoxinst_part() -> Result<String> {
                 Ok(ANSWER_MP.into())
             }
         }
-        Err(err) => Err(Error::msg(format!("Error mounting: {err}"))),
+        Err(err) => bail!("Error mounting: {err}"),
     }
 }
 

diff --git a/proxmox-fetch-answer/src/main.rs b/proxmox-fetch-answer/src/main.rs
index f55bf7631f2e1ef749cd5da8b5a87bab9c01056a..2482f149a57a1dcbf7fac06c03bbeeadda591cd9 100644 (file)
--- a/proxmox-fetch-answer/src/main.rs
+++ b/proxmox-fetch-answer/src/main.rs
@@ -1,7 +1,7 @@
 use std::process::ExitCode;
 use std::{fs, path::PathBuf};
 
-use anyhow::{anyhow, Error, Result};
+use anyhow::{bail, format_err, Result};
 use log::{error, info, LevelFilter};
 
 use proxmox_auto_installer::{
@@ -20,7 +20,7 @@ pub fn init_log() -> Result<()> {
     AutoInstLogger::init("/tmp/fetch_answer.log")?;
     log::set_logger(&LOGGER)
         .map(|()| log::set_max_level(LevelFilter::Info))
-        .map_err(|err| anyhow!(err))
+        .map_err(|err| format_err!(err))
 }
 
 fn fetch_answer(install_settings: &AutoInstSettings) -> Result<String> {
@@ -52,7 +52,7 @@ fn fetch_answer(install_settings: &AutoInstSettings) -> Result<String> {
             Err(err) => info!("Fetching answer file via HTTP failed: {err}"),
         },
     }
-    Err(Error::msg("Could not find any answer file!"))
+    bail!("Could not find any answer file!");
 }
 
 fn main() -> ExitCode {