github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 23:07:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4526 from fidencio/topic/fix-clippy-warnings-and-update-agent-vendored-code

Browse Source 
Fix clippy warnings and update agent's vendored code
This commit is contained in:
Fabiano Fidêncio
2022-06-24 14:02:28 +02:00
committed by GitHub
parent 133528dd14 c70d3a2c35
commit 03fca8b459
3 changed files with 351 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

633
src/agent/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
src/agent/src/netlink.rs
View File

@@ -523,7 +523,7 @@ impl Handle {
.as_ref()
.map(|to| to.address.as_str()) // Extract address field
.and_then(|addr| if addr.is_empty() { None } else { Some(addr) }) // Make sure it's not empty
.ok_or(anyhow!(nix::Error::EINVAL))?;
.ok_or_else(|| anyhow!(nix::Error::EINVAL))?;
let ip = IpAddr::from_str(ip_address)
.map_err(|e| anyhow!("Failed to parse IP {}: {:?}", ip_address, e))?;
@@ -612,7 +612,7 @@ fn parse_mac_address(addr: &str) -> Result<[u8; 6]> {
// Parse single Mac address block
let mut parse_next = || -> Result<u8> {
let v = u8::from_str_radix(split.next().ok_or(anyhow!(nix::Error::EINVAL))?, 16)?;
let v = u8::from_str_radix(split.next().ok_or_else(|| anyhow!(nix::Error::EINVAL))?, 16)?;
Ok(v)
};

4
src/agent/src/random.rs
View File

@@ -82,7 +82,7 @@ mod tests {
if nix::unistd::Uid::effective().is_root() {
assert!(ret.is_ok());
} else {
assert!(!ret.is_ok());
assert!(ret.is_err());
}
}
@@ -90,6 +90,6 @@ mod tests {
fn test_reseed_rng_zero_data() {
let seed = [];
let ret = reseed_rng(&seed);
assert!(!ret.is_ok());
assert!(ret.is_err());
}
}