From 467ec87700e95bb41de58ae1328a620d6b859ca8 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 26 Jun 2024 10:24:49 +0200 Subject: [PATCH] libazureinit: remove requirement of minimum Rust version Replace inspect_err with map_err, to remove requirement of the minimum Rust version from 1.76, which is apparently not wide-spread enough in other development environments. See also https://github.com/Azure/azure-init/pull/84#pullrequestreview-2086317824. --- libazureinit/Cargo.toml | 1 - libazureinit/src/media.rs | 14 ++++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libazureinit/Cargo.toml b/libazureinit/Cargo.toml index 1228b944..8b27eeb8 100644 --- a/libazureinit/Cargo.toml +++ b/libazureinit/Cargo.toml @@ -2,7 +2,6 @@ name = "libazureinit" version = "0.1.1" edition = "2021" -rust-version = "1.76" build = "build.rs" repository = "https://github.com/Azure/azure-init/" homepage = "https://github.com/Azure/azure-init/" diff --git a/libazureinit/src/media.rs b/libazureinit/src/media.rs index 76b6aabe..426e7e3a 100644 --- a/libazureinit/src/media.rs +++ b/libazureinit/src/media.rs @@ -193,16 +193,18 @@ pub fn parse_ovf_env(ovf_body: &str) -> Result { pub fn mount_parse_ovf_env(dev: String) -> Result { let mount_media = Media::new(PathBuf::from(dev), PathBuf::from(PATH_MOUNT_POINT)); - let mounted = mount_media.mount().inspect_err( - |e| tracing::error!(error = ?e, "Failed to mount media."), - )?; + let mounted = mount_media.mount().map_err(|e| { + tracing::error!(error = ?e, "Failed to mount media."); + e + })?; let ovf_body = mounted.read_ovf_env_to_string()?; let environment = parse_ovf_env(ovf_body.as_str())?; - mounted.unmount().inspect_err( - |e| tracing::error!(error = ?e, "Failed to remove media."), - )?; + mounted.unmount().map_err(|e| { + tracing::error!(error = ?e, "Failed to remove media."); + e + })?; Ok(environment) }