kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

net_util: trim qualified paths

Browse Source 
Import the std modules used across the crate instead of spelling the
full paths at every use site.

Signed-off-by: Henry Hrvoje Tonkovac <htonkovac@gmail.com>
Assisted-by: Claude:Opus-4.8
This commit is contained in:
Henry Hrvoje Tonkovac
2026-06-06 20:43:35 +02:00
committed by Rob Bradford
parent 4b671954a0
commit 0b3af8aed2
6 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net_util/src/tap.rs
View File

@@ -11,6 +11,7 @@ use std::io::{Error as IoError, Read, Result as IoResult, Write};
use std::net::{IpAddr, Ipv6Addr};
use std::os::raw::*;
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
use std::{mem, result, str};
use libc::{__c_anonymous_ifr_ifru, IFNAMSIZ, ifreq};
use thiserror::Error;
@@ -48,7 +49,7 @@ pub enum Error {
InvalidNetmask,
}
pub type Result<T> = ::std::result::Result<T, Error>;
pub type Result<T> = result::Result<T, Error>;
/// Handle for a network tap interface.
///
@@ -69,7 +70,7 @@ impl PartialEq for Tap {
}
}
impl std::clone::Clone for Tap {
impl Clone for Tap {
fn clone(&self) -> Self {
Tap {
tap_file: self.tap_file.try_clone().unwrap(),
@@ -342,9 +343,7 @@ impl Tap {
let ifreq = libc::in6_ifreq {
// SAFETY: addr can be safely transmuted to in6_addr
ifr6_addr: unsafe {
std::mem::transmute::<[u8; 16], libc::in6_addr>(addr.octets())
},
ifr6_addr: unsafe { mem::transmute::<[u8; 16], libc::in6_addr>(addr.octets()) },
ifr6_prefixlen: prefixlen as u32,
ifr6_ifindex: ifindex,
};
@@ -512,8 +511,7 @@ impl Tap {
/// also always created from Rust strings, thus valid UTF-8.
pub fn if_name_as_str(&self) -> &str {
// Panicking here is fine, see function documentation.
std::str::from_utf8(self.if_name.as_bytes())
.expect("Tap interface name should be valid UTF-8")
str::from_utf8(self.if_name.as_bytes()).expect("Tap interface name should be valid UTF-8")
}
#[cfg(fuzzing)]