Skip to content

Commit 2c60e93

Browse files
Erik Schillingepilys
Erik Schilling
authored andcommitted
fix "useless-vec" clippy warning
This warning is new in latest Rust and breaks when updating the CI environment [1]. [1] rust-vmm#258 Signed-off-by: Erik Schilling <[email protected]>
1 parent c8193d9 commit 2c60e93

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

crates/devices/virtio-blk/src/request.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ mod tests {
295295
let mem: GuestMemoryMmap =
296296
GuestMemoryMmap::from_ranges(&[(GuestAddress(0), 0x1000_0000)]).unwrap();
297297
// The `build_desc_chain` function will populate the `NEXT` related flags and field.
298-
let v = vec![
298+
let v = [
299299
// A device-writable request header descriptor.
300300
Descriptor::new(0x10_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
301301
Descriptor::new(0x20_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
@@ -318,7 +318,7 @@ mod tests {
318318
Error::UnexpectedWriteOnlyDescriptor
319319
);
320320

321-
let v = vec![
321+
let v = [
322322
Descriptor::new(0x10_0000, 0x100, 0, 0),
323323
Descriptor::new(0x20_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
324324
// A device-readable request status descriptor.
@@ -332,7 +332,7 @@ mod tests {
332332
Error::UnexpectedReadOnlyDescriptor
333333
);
334334

335-
let v = vec![
335+
let v = [
336336
Descriptor::new(0x10_0000, 0x100, 0, 0),
337337
Descriptor::new(0x20_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
338338
// Status descriptor with len = 0.
@@ -344,7 +344,7 @@ mod tests {
344344
Error::DescriptorLengthTooSmall
345345
);
346346

347-
let v = vec![
347+
let v = [
348348
Descriptor::new(0x10_0000, 0x100, 0, 0),
349349
Descriptor::new(0x20_0000, 0x100, 0, 0),
350350
Descriptor::new(0x30_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
@@ -376,7 +376,7 @@ mod tests {
376376
);
377377

378378
// Invalid status address.
379-
let v = vec![
379+
let v = [
380380
Descriptor::new(0x10_0000, 0x100, 0, 0),
381381
Descriptor::new(0x20_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
382382
Descriptor::new(0x30_0000, 0x200, VRING_DESC_F_WRITE as u16, 0),
@@ -401,7 +401,7 @@ mod tests {
401401
);
402402

403403
// Valid descriptor chain for OUT.
404-
let v = vec![
404+
let v = [
405405
Descriptor::new(0x10_0000, 0x100, 0, 0),
406406
Descriptor::new(0x20_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
407407
Descriptor::new(0x30_0000, 0x200, VRING_DESC_F_WRITE as u16, 0),
@@ -446,7 +446,7 @@ mod tests {
446446
assert_eq!(request.request_type(), RequestType::Unsupported(2));
447447

448448
// Valid descriptor chain for FLUSH.
449-
let v = vec![
449+
let v = [
450450
Descriptor::new(0x10_0000, 0x100, 0, 0),
451451
Descriptor::new(0x40_0000, 0x100, VRING_DESC_F_WRITE as u16, 0),
452452
];

crates/devices/virtio-console/src/console.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ mod tests {
351351
GuestMemoryMmap::from_ranges(&[(GuestAddress(0), 0x0001_0000)]).unwrap();
352352

353353
// One descriptor is write only
354-
let v = vec![
354+
let v = [
355355
Descriptor::new(0x1000, INPUT_SIZE, 0, 0),
356356
Descriptor::new(0x2000, INPUT_SIZE, VRING_DESC_F_WRITE as u16, 0),
357357
];
@@ -365,7 +365,7 @@ mod tests {
365365
);
366366

367367
// Descriptor is outside of the memory bounds
368-
let v = vec![
368+
let v = [
369369
Descriptor::new(0x0001_0000, INPUT_SIZE, 0, 0),
370370
Descriptor::new(0x0002_0000, INPUT_SIZE, 0, 0),
371371
];
@@ -378,7 +378,7 @@ mod tests {
378378
);
379379

380380
// Test normal functionality.
381-
let v = vec![
381+
let v = [
382382
Descriptor::new(0x3000, INPUT_SIZE, 0, 0),
383383
Descriptor::new(0x4000, INPUT_SIZE, 0, 0),
384384
];
@@ -418,7 +418,7 @@ mod tests {
418418
GuestMemoryMmap::from_ranges(&[(GuestAddress(0), 0x0001_0000)]).unwrap();
419419

420420
// One descriptor is read only
421-
let v = vec![
421+
let v = [
422422
Descriptor::new(0x1000, 0x10, VRING_DESC_F_WRITE as u16, 0),
423423
Descriptor::new(0x2000, INPUT_SIZE, 0, 0),
424424
];
@@ -432,7 +432,7 @@ mod tests {
432432
);
433433

434434
// Descriptor is out of memory bounds
435-
let v = vec![
435+
let v = [
436436
Descriptor::new(0x0001_0000, INPUT_SIZE, VRING_DESC_F_WRITE as u16, 0),
437437
Descriptor::new(0x0002_0000, INPUT_SIZE, VRING_DESC_F_WRITE as u16, 0),
438438
];
@@ -454,7 +454,7 @@ mod tests {
454454
console
455455
.enqueue_data(&mut vec![INPUT_VALUE * 2; INPUT_SIZE as usize])
456456
.unwrap();
457-
let v = vec![
457+
let v = [
458458
Descriptor::new(0x3000, INPUT_SIZE, VRING_DESC_F_WRITE as u16, 0),
459459
Descriptor::new(0x4000, INPUT_SIZE, VRING_DESC_F_WRITE as u16, 0),
460460
];
@@ -477,7 +477,7 @@ mod tests {
477477
console
478478
.enqueue_data(&mut vec![INPUT_VALUE; 2 * INPUT_SIZE as usize])
479479
.unwrap();
480-
let v = vec![Descriptor::new(
480+
let v = [Descriptor::new(
481481
0x5000,
482482
INPUT_SIZE,
483483
VRING_DESC_F_WRITE as u16,
@@ -497,7 +497,7 @@ mod tests {
497497

498498
assert!(!console.is_input_buffer_empty());
499499

500-
let v = vec![Descriptor::new(
500+
let v = [Descriptor::new(
501501
0x6000,
502502
INPUT_SIZE,
503503
VRING_DESC_F_WRITE as u16,
@@ -516,7 +516,7 @@ mod tests {
516516
assert!(console.is_input_buffer_empty());
517517

518518
// Input buffer is empty.
519-
let v = vec![Descriptor::new(
519+
let v = [Descriptor::new(
520520
0x7000,
521521
INPUT_SIZE,
522522
VRING_DESC_F_WRITE as u16,

0 commit comments

Comments
 (0)