From 1dd86807fd7a4987b9e9db427015c29df8bcc084 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Thu, 3 Jul 2025 08:01:36 +0200 Subject: [PATCH] Fix cargo clippy issues --- virtweb_backend/src/actors/libvirt_actor.rs | 15 ++++++--------- virtweb_backend/src/app_config.rs | 2 +- .../src/controllers/disk_images_controller.rs | 3 +-- virtweb_backend/src/controllers/iso_controller.rs | 2 +- virtweb_backend/src/controllers/mod.rs | 2 +- .../src/libvirt_rest_structures/nw_filter.rs | 2 +- .../src/middlewares/auth_middleware.rs | 3 +-- virtweb_backend/src/utils/cloud_init_utils.rs | 4 ++-- 8 files changed, 14 insertions(+), 19 deletions(-) diff --git a/virtweb_backend/src/actors/libvirt_actor.rs b/virtweb_backend/src/actors/libvirt_actor.rs index 288d33f..26dd793 100644 --- a/virtweb_backend/src/actors/libvirt_actor.rs +++ b/virtweb_backend/src/actors/libvirt_actor.rs @@ -27,10 +27,7 @@ impl LibVirtActor { /// Connect to hypervisor pub async fn connect() -> anyhow::Result { let hypervisor_uri = AppConfig::get().hypervisor_uri.as_deref().unwrap_or(""); - log::info!( - "Will connect to hypvervisor at address '{}'", - hypervisor_uri - ); + log::info!("Will connect to hypvervisor at address '{hypervisor_uri}'",); let conn = Connect::open(Some(hypervisor_uri))?; Ok(Self { m: conn }) @@ -102,7 +99,7 @@ impl Handler for LibVirtActor { log::debug!("Get domain XML:\n{}", msg.0.as_string()); let domain = Domain::lookup_by_uuid_string(&self.m, &msg.0.as_string())?; let xml = domain.get_xml_desc(VIR_DOMAIN_XML_SECURE)?; - log::debug!("XML = {}", xml); + log::debug!("XML = {xml}"); DomainXML::parse_xml(&xml) } } @@ -131,7 +128,7 @@ impl Handler for LibVirtActor { fn handle(&mut self, mut msg: DefineDomainReq, _ctx: &mut Self::Context) -> Self::Result { let xml = msg.1.as_xml()?; - log::debug!("Define domain:\n{}", xml); + log::debug!("Define domain:\n{xml}"); let domain = Domain::define_xml(&self.m, &xml)?; let uuid = XMLUuid::parse_from_str(&domain.get_uuid_string()?)?; @@ -446,7 +443,7 @@ impl Handler for LibVirtActor { log::debug!("Get network XML:\n{}", msg.0.as_string()); let network = Network::lookup_by_uuid_string(&self.m, &msg.0.as_string())?; let xml = network.get_xml_desc(0)?; - log::debug!("XML = {}", xml); + log::debug!("XML = {xml}"); NetworkXML::parse_xml(&xml) } } @@ -602,7 +599,7 @@ impl Handler for LibVirtActor { log::debug!("Get network filter XML:\n{}", msg.0.as_string()); let filter = NWFilter::lookup_by_uuid_string(&self.m, &msg.0.as_string())?; let xml = filter.get_xml_desc(0)?; - log::debug!("XML = {}", xml); + log::debug!("XML = {xml}"); NetworkFilterXML::parse_xml(xml) } } @@ -617,7 +614,7 @@ impl Handler for LibVirtActor { fn handle(&mut self, mut msg: DefineNWFilterReq, _ctx: &mut Self::Context) -> Self::Result { let xml = msg.1.into_xml()?; - log::debug!("Define network filter:\n{}", xml); + log::debug!("Define network filter:\n{xml}"); let filter = NWFilter::define_xml(&self.m, &xml)?; let uuid = XMLUuid::parse_from_str(&filter.get_uuid_string()?)?; diff --git a/virtweb_backend/src/app_config.rs b/virtweb_backend/src/app_config.rs index f270831..4bc0ef8 100644 --- a/virtweb_backend/src/app_config.rs +++ b/virtweb_backend/src/app_config.rs @@ -280,7 +280,7 @@ impl AppConfig { /// Get VM vnc sockets path for domain pub fn vnc_socket_for_domain(&self, name: &str) -> PathBuf { - self.vnc_sockets_path().join(format!("vnc-{}", name)) + self.vnc_sockets_path().join(format!("vnc-{name}")) } /// Get VM root disks storage directory diff --git a/virtweb_backend/src/controllers/disk_images_controller.rs b/virtweb_backend/src/controllers/disk_images_controller.rs index f19c77d..ca39e2f 100644 --- a/virtweb_backend/src/controllers/disk_images_controller.rs +++ b/virtweb_backend/src/controllers/disk_images_controller.rs @@ -34,8 +34,7 @@ pub async fn upload(MultipartForm(mut form): MultipartForm) if let Some(mime_type) = file.content_type { if !constants::ALLOWED_DISK_IMAGES_MIME_TYPES.contains(&mime_type.as_ref()) { return Ok(HttpResponse::BadRequest().json(format!( - "Unsupported file type for disk upload: {}", - mime_type + "Unsupported file type for disk upload: {mime_type}" ))); } } diff --git a/virtweb_backend/src/controllers/iso_controller.rs b/virtweb_backend/src/controllers/iso_controller.rs index 37bbfb7..383b43d 100644 --- a/virtweb_backend/src/controllers/iso_controller.rs +++ b/virtweb_backend/src/controllers/iso_controller.rs @@ -52,7 +52,7 @@ pub async fn upload_file(MultipartForm(mut form): MultipartForm) } let dest_file = AppConfig::get().iso_storage_path().join(file_name); - log::info!("Will save ISO file {:?}", dest_file); + log::info!("Will save ISO file {dest_file:?}"); if dest_file.exists() { log::error!("Conflict with uploaded iso file name!"); diff --git a/virtweb_backend/src/controllers/mod.rs b/virtweb_backend/src/controllers/mod.rs index 96c95d3..bcf68e1 100644 --- a/virtweb_backend/src/controllers/mod.rs +++ b/virtweb_backend/src/controllers/mod.rs @@ -43,7 +43,7 @@ impl actix_web::error::ResponseError for HttpErr { } } fn error_response(&self) -> HttpResponse { - log::error!("Error while processing request! {}", self); + log::error!("Error while processing request! {self}"); HttpResponse::InternalServerError().body("Failed to execute request!") } diff --git a/virtweb_backend/src/libvirt_rest_structures/nw_filter.rs b/virtweb_backend/src/libvirt_rest_structures/nw_filter.rs index 20706cd..c18943b 100644 --- a/virtweb_backend/src/libvirt_rest_structures/nw_filter.rs +++ b/virtweb_backend/src/libvirt_rest_structures/nw_filter.rs @@ -109,7 +109,7 @@ fn extract_ip_mask(n: Option) -> anyhow::Result> fn extract_nw_filter_comment(n: &Option) -> anyhow::Result> { if let Some(comment) = n { if comment.len() > 256 || comment.contains('\"') || comment.contains('\n') { - return Err(NetworkFilterExtraction(format!("Invalid comment! {}", comment)).into()); + return Err(NetworkFilterExtraction(format!("Invalid comment! {comment}")).into()); } } diff --git a/virtweb_backend/src/middlewares/auth_middleware.rs b/virtweb_backend/src/middlewares/auth_middleware.rs index 2c365c7..d111abd 100644 --- a/virtweb_backend/src/middlewares/auth_middleware.rs +++ b/virtweb_backend/src/middlewares/auth_middleware.rs @@ -69,8 +69,7 @@ where if !AppConfig::get().is_allowed_ip(remote_ip.0) { log::error!( - "An attempt to access VirtWeb from an unauthorized network has been intercepted! {:?}", - remote_ip + "An attempt to access VirtWeb from an unauthorized network has been intercepted! {remote_ip:?}" ); return Ok(req .into_response( diff --git a/virtweb_backend/src/utils/cloud_init_utils.rs b/virtweb_backend/src/utils/cloud_init_utils.rs index 8891035..39df8d3 100644 --- a/virtweb_backend/src/utils/cloud_init_utils.rs +++ b/virtweb_backend/src/utils/cloud_init_utils.rs @@ -81,10 +81,10 @@ impl CloudInitConfig { // Process metadata let mut metadatas = vec![]; if let Some(inst_id) = &self.instance_id { - metadatas.push(format!("instance-id: {}", inst_id)); + metadatas.push(format!("instance-id: {inst_id}")); } if let Some(local_hostname) = &self.local_hostname { - metadatas.push(format!("local-hostname: {}", local_hostname)); + metadatas.push(format!("local-hostname: {local_hostname}")); } if let Some(dsmode) = &self.dsmode { metadatas.push(format!(