mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-28 09:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clippy: fix disk crate

Browse source 
Just a few nit fixes and we can now enable clippy for this crate.

BUG=b:192373803
TEST=./tools/clippy

Change-Id: Ia6ab90fa33e979066d9eeae2372630d93cf4026a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3441343
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
This commit is contained in:
Dennis Kempin 2022-02-04 14:56:45 -08:00 committed by Commit Bot
parent 4a356f670a
commit 7a543caa2e
5 changed files with 32 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
disk/src/composite.rs
View file

@ -725,7 +725,7 @@ mod tests {
file2.as_raw_descriptor(), file2.as_raw_descriptor(),
file3.as_raw_descriptor(), file3.as_raw_descriptor(),
]; ];
in_fds.sort(); in_fds.sort_unstable();
let disk_part1 = ComponentDiskPart { let disk_part1 = ComponentDiskPart {
file: Box::new(file1), file: Box::new(file1),
offset: 0, offset: 0,
@ -743,7 +743,7 @@ mod tests {
}; };
let composite = CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap(); let composite = CompositeDiskFile::new(vec![disk_part1, disk_part2, disk_part3]).unwrap();
let mut out_fds = composite.as_raw_descriptors(); let mut out_fds = composite.as_raw_descriptors();
out_fds.sort(); out_fds.sort_unstable();
assert_eq!(in_fds, out_fds); assert_eq!(in_fds, out_fds);
} }
@ -816,9 +816,7 @@ mod tests {
.read_exact_at_volatile(output_volatile_memory.get_slice(0, 300).unwrap(), 0) .read_exact_at_volatile(output_volatile_memory.get_slice(0, 300).unwrap(), 0)
.unwrap(); .unwrap();
for i in 50..250 { input_memory[50..250].iter_mut().for_each(|x| *x = 0);
input_memory[i] = 0;
}
assert!(input_memory.iter().eq(output_memory.iter())); assert!(input_memory.iter().eq(output_memory.iter()));
} }
@ -861,9 +859,7 @@ mod tests {
.read_exact_at_volatile(output_volatile_memory.get_slice(0, 300).unwrap(), 0) .read_exact_at_volatile(output_volatile_memory.get_slice(0, 300).unwrap(), 0)
.unwrap(); .unwrap();
for i in 50..250 { input_memory[50..250].iter_mut().for_each(|x| *x = 0);
input_memory[i] = 0;
}
for i in 0..300 { for i in 0..300 {
println!( println!(
"input[{0}] = {1}, output[{0}] = {2}", "input[{0}] = {1}, output[{0}] = {2}",

8
disk/src/disk.rs
View file

@ -590,7 +590,7 @@ mod tests {
// detect_image_type is ever updated to validate more of the header, this test would need // detect_image_type is ever updated to validate more of the header, this test would need
// to be updated. // to be updated.
let buf: &[u8] = &[0x51, 0x46, 0x49, 0xfb]; let buf: &[u8] = &[0x51, 0x46, 0x49, 0xfb];
t.write_all(&buf).unwrap(); t.write_all(buf).unwrap();
let image_type = detect_image_type(&t).expect("failed to detect image type"); let image_type = detect_image_type(&t).expect("failed to detect image type");
assert_eq!(image_type, ImageType::Qcow2); assert_eq!(image_type, ImageType::Qcow2);
} }
@ -602,7 +602,7 @@ mod tests {
// detect_image_type is ever updated to validate more of the header, this test would need // detect_image_type is ever updated to validate more of the header, this test would need
// to be updated. // to be updated.
let buf: &[u8] = &[0x3a, 0xff, 0x26, 0xed]; let buf: &[u8] = &[0x3a, 0xff, 0x26, 0xed];
t.write_all(&buf).unwrap(); t.write_all(buf).unwrap();
let image_type = detect_image_type(&t).expect("failed to detect image type"); let image_type = detect_image_type(&t).expect("failed to detect image type");
assert_eq!(image_type, ImageType::AndroidSparse); assert_eq!(image_type, ImageType::AndroidSparse);
} }
@ -615,7 +615,7 @@ mod tests {
// detect_image_type is ever updated to validate more of the header, this test would need // detect_image_type is ever updated to validate more of the header, this test would need
// to be updated. // to be updated.
let buf = "composite_disk\x1d".as_bytes(); let buf = "composite_disk\x1d".as_bytes();
t.write_all(&buf).unwrap(); t.write_all(buf).unwrap();
let image_type = detect_image_type(&t).expect("failed to detect image type"); let image_type = detect_image_type(&t).expect("failed to detect image type");
assert_eq!(image_type, ImageType::CompositeDisk); assert_eq!(image_type, ImageType::CompositeDisk);
} }
@ -626,7 +626,7 @@ mod tests {
// Write a file smaller than the four-byte qcow2/sparse magic to ensure the small file logic // Write a file smaller than the four-byte qcow2/sparse magic to ensure the small file logic
// works correctly and handles it as a raw file. // works correctly and handles it as a raw file.
let buf: &[u8] = &[0xAA, 0xBB]; let buf: &[u8] = &[0xAA, 0xBB];
t.write_all(&buf).unwrap(); t.write_all(buf).unwrap();
let image_type = detect_image_type(&t).expect("failed to detect image type"); let image_type = detect_image_type(&t).expect("failed to detect image type");
assert_eq!(image_type, ImageType::Raw); assert_eq!(image_type, ImageType::Raw);
} }

46
disk/src/qcow/mod.rs
View file

@ -1822,7 +1822,7 @@ mod tests {
fn basic_file(header: &[u8]) -> File { fn basic_file(header: &[u8]) -> File {
let mut disk_file = tempfile().expect("failed to create tempfile"); let mut disk_file = tempfile().expect("failed to create tempfile");
disk_file.write_all(&header).unwrap(); disk_file.write_all(header).unwrap();
disk_file.set_len(0x8000_0000).unwrap(); disk_file.set_len(0x8000_0000).unwrap();
disk_file.seek(SeekFrom::Start(0)).unwrap(); disk_file.seek(SeekFrom::Start(0)).unwrap();
disk_file disk_file
@ -1920,7 +1920,7 @@ mod tests {
#[test] #[test]
fn test_header_excessive_file_size_rejected() { fn test_header_excessive_file_size_rejected() {
let mut header = valid_header(); let mut header = valid_header();
&mut header[24..32].copy_from_slice(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e]); header[24..32].copy_from_slice(&[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1e]);
with_basic_file(&header, |disk_file: File| { with_basic_file(&header, |disk_file: File| {
QcowFile::from(disk_file, MAX_NESTING_DEPTH).expect_err("Failed to create file."); QcowFile::from(disk_file, MAX_NESTING_DEPTH).expect_err("Failed to create file.");
}); });
@ -1970,7 +1970,7 @@ mod tests {
#[test] #[test]
fn test_header_huge_num_refcounts() { fn test_header_huge_num_refcounts() {
let mut header = valid_header(); let mut header = valid_header();
&mut header[56..60].copy_from_slice(&[0x02, 0x00, 0xe8, 0xff]); header[56..60].copy_from_slice(&[0x02, 0x00, 0xe8, 0xff]);
with_basic_file(&header, |disk_file: File| { with_basic_file(&header, |disk_file: File| {
QcowFile::from(disk_file, MAX_NESTING_DEPTH) QcowFile::from(disk_file, MAX_NESTING_DEPTH)
.expect_err("Created disk with excessive refcount clusters"); .expect_err("Created disk with excessive refcount clusters");
@ -1980,7 +1980,7 @@ mod tests {
#[test] #[test]
fn test_header_huge_refcount_offset() { fn test_header_huge_refcount_offset() {
let mut header = valid_header(); let mut header = valid_header();
&mut header[48..56].copy_from_slice(&[0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00]); header[48..56].copy_from_slice(&[0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x02, 0x00]);
with_basic_file(&header, |disk_file: File| { with_basic_file(&header, |disk_file: File| {
QcowFile::from(disk_file, MAX_NESTING_DEPTH) QcowFile::from(disk_file, MAX_NESTING_DEPTH)
.expect_err("Created disk with excessive refcount offset"); .expect_err("Created disk with excessive refcount offset");
@ -1991,11 +1991,11 @@ mod tests {
fn write_read_start() { fn write_read_start() {
with_basic_file(&valid_header(), |disk_file: File| { with_basic_file(&valid_header(), |disk_file: File| {
let mut q = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap(); let mut q = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap();
q.write(b"test first bytes") q.write_all(b"test first bytes")
.expect("Failed to write test string."); .expect("Failed to write test string.");
let mut buf = [0u8; 4]; let mut buf = [0u8; 4];
q.seek(SeekFrom::Start(0)).expect("Failed to seek."); q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
q.read(&mut buf).expect("Failed to read."); q.read_exact(&mut buf).expect("Failed to read.");
assert_eq!(&buf, b"test"); assert_eq!(&buf, b"test");
}); });
} }
@ -2005,14 +2005,14 @@ mod tests {
let disk_file = basic_file(&valid_header()); let disk_file = basic_file(&valid_header());
let mut backing = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap(); let mut backing = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap();
backing backing
.write(b"test first bytes") .write_all(b"test first bytes")
.expect("Failed to write test string."); .expect("Failed to write test string.");
let mut buf = [0u8; 4]; let mut buf = [0u8; 4];
let wrapping_disk_file = basic_file(&valid_header()); let wrapping_disk_file = basic_file(&valid_header());
let mut wrapping = QcowFile::from(wrapping_disk_file, MAX_NESTING_DEPTH).unwrap(); let mut wrapping = QcowFile::from(wrapping_disk_file, MAX_NESTING_DEPTH).unwrap();
wrapping.set_backing_file(Some(Box::new(backing))); wrapping.set_backing_file(Some(Box::new(backing)));
wrapping.seek(SeekFrom::Start(0)).expect("Failed to seek."); wrapping.seek(SeekFrom::Start(0)).expect("Failed to seek.");
wrapping.read(&mut buf).expect("Failed to read."); wrapping.read_exact(&mut buf).expect("Failed to read.");
assert_eq!(&buf, b"test"); assert_eq!(&buf, b"test");
} }
@ -2021,18 +2021,18 @@ mod tests {
let disk_file = basic_file(&valid_header()); let disk_file = basic_file(&valid_header());
let mut backing = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap(); let mut backing = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap();
backing backing
.write(b"test first bytes") .write_all(b"test first bytes")
.expect("Failed to write test string."); .expect("Failed to write test string.");
let wrapping_disk_file = basic_file(&valid_header()); let wrapping_disk_file = basic_file(&valid_header());
let mut wrapping = QcowFile::from(wrapping_disk_file, MAX_NESTING_DEPTH).unwrap(); let mut wrapping = QcowFile::from(wrapping_disk_file, MAX_NESTING_DEPTH).unwrap();
wrapping.set_backing_file(Some(Box::new(backing))); wrapping.set_backing_file(Some(Box::new(backing)));
wrapping.seek(SeekFrom::Start(0)).expect("Failed to seek."); wrapping.seek(SeekFrom::Start(0)).expect("Failed to seek.");
wrapping wrapping
.write(b"TEST") .write_all(b"TEST")
.expect("Failed to write second test string."); .expect("Failed to write second test string.");
let mut buf = [0u8; 10]; let mut buf = [0u8; 10];
wrapping.seek(SeekFrom::Start(0)).expect("Failed to seek."); wrapping.seek(SeekFrom::Start(0)).expect("Failed to seek.");
wrapping.read(&mut buf).expect("Failed to read."); wrapping.read_exact(&mut buf).expect("Failed to read.");
assert_eq!(&buf, b"TEST first"); assert_eq!(&buf, b"TEST first");
} }
@ -2042,10 +2042,10 @@ mod tests {
let mut q = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap(); let mut q = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap();
let b = [0x55u8; 0x1000]; let b = [0x55u8; 0x1000];
q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek."); q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek.");
q.write(&b).expect("Failed to write test string."); q.write_all(&b).expect("Failed to write test string.");
let mut buf = [0u8; 4]; let mut buf = [0u8; 4];
q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek."); q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek.");
q.read(&mut buf).expect("Failed to read."); q.read_exact(&mut buf).expect("Failed to read.");
assert_eq!(buf[0], 0x55); assert_eq!(buf[0], 0x55);
}); });
} }
@ -2057,14 +2057,14 @@ mod tests {
// Write some test data. // Write some test data.
let b = [0x55u8; 0x1000]; let b = [0x55u8; 0x1000];
q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek."); q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek.");
q.write(&b).expect("Failed to write test string."); q.write_all(&b).expect("Failed to write test string.");
// Overwrite the test data with zeroes. // Overwrite the test data with zeroes.
q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek."); q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek.");
q.write_zeroes_all(0x200).expect("Failed to write zeroes."); q.write_zeroes_all(0x200).expect("Failed to write zeroes.");
// Verify that the correct part of the data was zeroed out. // Verify that the correct part of the data was zeroed out.
let mut buf = [0u8; 0x1000]; let mut buf = [0u8; 0x1000];
q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek."); q.seek(SeekFrom::Start(0xfff2000)).expect("Failed to seek.");
q.read(&mut buf).expect("Failed to read."); q.read_exact(&mut buf).expect("Failed to read.");
assert_eq!(buf[0], 0); assert_eq!(buf[0], 0);
assert_eq!(buf[0x1FF], 0); assert_eq!(buf[0x1FF], 0);
assert_eq!(buf[0x200], 0x55); assert_eq!(buf[0x200], 0x55);
@ -2082,7 +2082,7 @@ mod tests {
// Write some test data. // Write some test data.
let b = [0x55u8; CHUNK_SIZE]; let b = [0x55u8; CHUNK_SIZE];
q.seek(SeekFrom::Start(0)).expect("Failed to seek."); q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
q.write(&b).expect("Failed to write test string."); q.write_all(&b).expect("Failed to write test string.");
// Overwrite the full cluster with zeroes. // Overwrite the full cluster with zeroes.
q.seek(SeekFrom::Start(0)).expect("Failed to seek."); q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
q.write_zeroes_all(CHUNK_SIZE) q.write_zeroes_all(CHUNK_SIZE)
@ -2090,7 +2090,7 @@ mod tests {
// Verify that the data was zeroed out. // Verify that the data was zeroed out.
let mut buf = [0u8; CHUNK_SIZE]; let mut buf = [0u8; CHUNK_SIZE];
q.seek(SeekFrom::Start(0)).expect("Failed to seek."); q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
q.read(&mut buf).expect("Failed to read."); q.read_exact(&mut buf).expect("Failed to read.");
assert_eq!(buf[0], 0); assert_eq!(buf[0], 0);
assert_eq!(buf[CHUNK_SIZE - 1], 0); assert_eq!(buf[CHUNK_SIZE - 1], 0);
}); });
@ -2105,7 +2105,7 @@ mod tests {
backing backing
.seek(SeekFrom::Start(0xfff2000)) .seek(SeekFrom::Start(0xfff2000))
.expect("Failed to seek."); .expect("Failed to seek.");
backing.write(&b).expect("Failed to write test string."); backing.write_all(&b).expect("Failed to write test string.");
let wrapping_disk_file = basic_file(&valid_header()); let wrapping_disk_file = basic_file(&valid_header());
let mut wrapping = QcowFile::from(wrapping_disk_file, MAX_NESTING_DEPTH).unwrap(); let mut wrapping = QcowFile::from(wrapping_disk_file, MAX_NESTING_DEPTH).unwrap();
wrapping.set_backing_file(Some(Box::new(backing))); wrapping.set_backing_file(Some(Box::new(backing)));
@ -2122,7 +2122,7 @@ mod tests {
wrapping wrapping
.seek(SeekFrom::Start(0xfff2000)) .seek(SeekFrom::Start(0xfff2000))
.expect("Failed to seek."); .expect("Failed to seek.");
wrapping.read(&mut buf).expect("Failed to read."); wrapping.read_exact(&mut buf).expect("Failed to read.");
assert_eq!(buf[0], 0); assert_eq!(buf[0], 0);
assert_eq!(buf[0x1FF], 0); assert_eq!(buf[0x1FF], 0);
assert_eq!(buf[0x200], 0x55); assert_eq!(buf[0x200], 0x55);
@ -2143,7 +2143,7 @@ mod tests {
let mut q = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap(); let mut q = QcowFile::from(disk_file, MAX_NESTING_DEPTH).unwrap();
let mut b = [5u8; 16]; let mut b = [5u8; 16];
q.seek(SeekFrom::Start(1000)).expect("Failed to seek."); q.seek(SeekFrom::Start(1000)).expect("Failed to seek.");
q.read(&mut b).expect("Failed to read."); q.read_exact(&mut b).expect("Failed to read.");
assert_eq!(0, b[0]); assert_eq!(0, b[0]);
assert_eq!(0, b[15]); assert_eq!(0, b[15]);
}); });
@ -2516,7 +2516,7 @@ mod tests {
for xfer in &xfers { for xfer in &xfers {
q.seek(SeekFrom::Start(xfer.addr)).expect("Failed to seek."); q.seek(SeekFrom::Start(xfer.addr)).expect("Failed to seek.");
if xfer.write { if xfer.write {
q.write(&b).expect("Failed to write."); q.write_all(&b).expect("Failed to write.");
} else { } else {
let read_count: usize = q.read(&mut b).expect("Failed to read."); let read_count: usize = q.read(&mut b).expect("Failed to read.");
assert_eq!(read_count, BUF_SIZE); assert_eq!(read_count, BUF_SIZE);
@ -2720,7 +2720,7 @@ mod tests {
.unwrap(); .unwrap();
let _level1_qcow_file = QcowFile::new_from_backing( let _level1_qcow_file = QcowFile::new_from_backing(
level1_qcow_file, level1_qcow_file,
&backing_file_path.to_str().unwrap(), backing_file_path.to_str().unwrap(),
1000, /* allow deep nesting */ 1000, /* allow deep nesting */
) )
.unwrap(); .unwrap();
@ -2728,7 +2728,7 @@ mod tests {
let level2_qcow_file = tempfile().unwrap(); let level2_qcow_file = tempfile().unwrap();
let _level2_qcow_file = QcowFile::new_from_backing( let _level2_qcow_file = QcowFile::new_from_backing(
level2_qcow_file, level2_qcow_file,
&level1_qcow_file_path.to_str().unwrap(), level1_qcow_file_path.to_str().unwrap(),
1000, /* allow deep nesting */ 1000, /* allow deep nesting */
) )
.expect("failed to create level2 qcow file"); .expect("failed to create level2 qcow file");

2
disk/src/qcow/vec_cache.rs
View file

@ -178,7 +178,7 @@ mod tests {
// Check that three of the four items inserted are still there and that the most recently // Check that three of the four items inserted are still there and that the most recently
// inserted is one of them. // inserted is one of them.
let num_items = (0..=3).filter(|k| cache.contains_key(&k)).count(); let num_items = (0..=3).filter(|k| cache.contains_key(k)).count();
assert_eq!(num_items, 3); assert_eq!(num_items, 3);
assert!(cache.contains_key(&3)); assert!(cache.contains_key(&3));
} }

1
tools/clippy
View file

@ -15,7 +15,6 @@ cd "$(dirname $0)/.."
# TODO(b/192373803): Clean up clippy error is the following crates # TODO(b/192373803): Clean up clippy error is the following crates
EXCLUDE=( EXCLUDE=(
devices # 92 errors devices # 92 errors
disk # 36 errors
kvm # 641 errors kvm # 641 errors
kvm_sys # 613 errors kvm_sys # 613 errors
libvda # 79 errors libvda # 79 errors