mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2026-08-05 02:19:16 +00:00
misc: Fix clippy error from beta compiler
Rust has a new way of constructing other error and clippy complains if
we are still using the older way to construct error message. Thus,
migrate to the new approach suggested by the clippy.
Warning from beta compiler:
error: this can be `std::io::Error::other(_)`
--> block/src/vhdx/mod.rs:142:17
|
| / std::io::Error::new(
| | std::io::ErrorKind::Other,
| | format!("Failed to update VHDx header: {e}"),
| | )
| |_________________^
|
= help: for further information visit
https://rust-lang.github.io/rust-clippy/master/index.html#io_other_error
help: use `std::io::Error::other`
std::io::Error::other(
format!("Failed to update VHDx header: {e}"),
Signed-off-by: Jinank Jain <jinankjain@microsoft.com>
This commit is contained in:
@@ -723,10 +723,9 @@ impl Mem {
|
||||
let region_len = region.len();
|
||||
|
||||
if region_len != region_len / VIRTIO_MEM_ALIGN_SIZE * VIRTIO_MEM_ALIGN_SIZE {
|
||||
return Err(io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
format!("Virtio-mem size is not aligned with {VIRTIO_MEM_ALIGN_SIZE}"),
|
||||
));
|
||||
return Err(io::Error::other(format!(
|
||||
"Virtio-mem size is not aligned with {VIRTIO_MEM_ALIGN_SIZE}"
|
||||
)));
|
||||
}
|
||||
|
||||
let (avail_features, acked_features, config, paused) = if let Some(state) = state {
|
||||
@@ -753,12 +752,9 @@ impl Mem {
|
||||
|
||||
if initial_size != 0 {
|
||||
config.resize(initial_size).map_err(|e| {
|
||||
io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
format!(
|
||||
"Failed to resize virtio-mem configuration to {initial_size}: {e:?}"
|
||||
),
|
||||
)
|
||||
io::Error::other(format!(
|
||||
"Failed to resize virtio-mem configuration to {initial_size}: {e:?}"
|
||||
))
|
||||
})?;
|
||||
}
|
||||
|
||||
@@ -770,10 +766,7 @@ impl Mem {
|
||||
// Make sure the virtio-mem configuration complies with the
|
||||
// specification.
|
||||
config.validate().map_err(|e| {
|
||||
io::Error::new(
|
||||
io::ErrorKind::Other,
|
||||
format!("Invalid virtio-mem configuration: {e:?}"),
|
||||
)
|
||||
io::Error::other(format!("Invalid virtio-mem configuration: {e:?}"))
|
||||
})?;
|
||||
|
||||
(avail_features, 0, config, false)
|
||||
|
||||
Reference in New Issue
Block a user