fix clippy errors

We are running clippy now with --all-targets as well.

Signed-off-by: Laura Loghin <[email protected]>

Author: lauralt

src/cmdline/mod.rs

@@ -465,21 +465,18 @@ mod tests {
             cl.insert_multiple("foo", &no_vals),
             Err(Error::MissingVal("foo".to_string()))
         );
+        assert_eq!(cl.insert_multiple("foo", &["bar "]), Err(Error::HasSpace));
         assert_eq!(
-            cl.insert_multiple("foo", &vec!["bar "]),
-            Err(Error::HasSpace)
-        );
-        assert_eq!(
-            cl.insert_multiple("foo", &vec!["bar", "baz"]),
+            cl.insert_multiple("foo", &["bar", "baz"]),
             Err(Error::TooLarge)
         );
 
         let mut cl = Cmdline::new(100);
-        assert!(cl.insert_multiple("foo", &vec!["bar"]).is_ok());
+        assert!(cl.insert_multiple("foo", &["bar"]).is_ok());
         assert_eq!(cl.as_str(), "foo=bar");
 
         let mut cl = Cmdline::new(100);
-        assert!(cl.insert_multiple("foo", &vec!["bar", "baz"]).is_ok());
+        assert!(cl.insert_multiple("foo", &["bar", "baz"]).is_ok());
         assert_eq!(cl.as_str(), "foo=bar,baz");
     }
 }

src/configurator/mod.rs

@@ -520,31 +520,36 @@ mod tests {
     fn test_bootparam_list_addition() {
         let mut accumulator: Vec<u8> = vec![];
         let start = GuestAddress(0x1000);
-        let foo = Foobar::default();
+        let element = Foobar::default();
 
         // Error case: start address not specified.
         assert_eq!(
             format!(
                 "{:?}",
-                BootParams::add_boot_parameter_to_list(&foo, None, &mut accumulator, &mut None)
+                BootParams::add_boot_parameter_to_list(&element, None, &mut accumulator, &mut None)
                     .err()
             ),
             "Some(MissingStartAddress)"
         );
 
         // Success case: start address is set, element address not specified - will be appended.
         assert_eq!(
-            BootParams::add_boot_parameter_to_list(&foo, None, &mut accumulator, &mut Some(start))
-                .unwrap(),
+            BootParams::add_boot_parameter_to_list(
+                &element,
+                None,
+                &mut accumulator,
+                &mut Some(start)
+            )
+            .unwrap(),
             start
         );
-        assert_eq!(accumulator, foo.as_slice().to_vec());
+        assert_eq!(accumulator, element.as_slice().to_vec());
 
         // Success case: start address is unset, element address is specified.
         let mut list_start_opt: Option<GuestAddress> = None;
         assert_eq!(
             BootParams::add_boot_parameter_to_list(
-                &foo,
+                &element,
                 Some(start),
                 &mut accumulator,
                 &mut list_start_opt
@@ -553,14 +558,14 @@ mod tests {
             start
         );
         assert_eq!(list_start_opt, Some(start));
-        assert_eq!(accumulator, foo.as_slice().to_vec());
+        assert_eq!(accumulator, element.as_slice().to_vec());
 
         // Error case: start address is set, element address is specified, but precedes start.
         assert_eq!(
             format!(
                 "{:?}",
                 BootParams::add_boot_parameter_to_list(
-                    &foo,
+                    &element,
                     Some(start.unchecked_sub(0x100)),
                     &mut accumulator,
                     &mut list_start_opt
@@ -576,7 +581,7 @@ mod tests {
         accumulator.clear();
         // Start by adding 2 elements.
         assert!(BootParams::add_boot_parameter_to_list(
-            &foo,
+            &element,
             None,
             &mut accumulator,
             &mut list_start_opt

src/loader/mod.rs

@@ -263,18 +263,18 @@ mod tests {
         cl.insert_str("1234").unwrap();
         assert_eq!(Ok(()), load_cmdline(&gm, cmdline_address, &cl));
         let val: u8 = gm.read_obj(cmdline_address).unwrap();
-        assert_eq!(val, '1' as u8);
+        assert_eq!(val, b'1');
         cmdline_address = cmdline_address.unchecked_add(1);
         let val: u8 = gm.read_obj(cmdline_address).unwrap();
-        assert_eq!(val, '2' as u8);
+        assert_eq!(val, b'2');
         cmdline_address = cmdline_address.unchecked_add(1);
         let val: u8 = gm.read_obj(cmdline_address).unwrap();
-        assert_eq!(val, '3' as u8);
+        assert_eq!(val, b'3');
         cmdline_address = cmdline_address.unchecked_add(1);
         let val: u8 = gm.read_obj(cmdline_address).unwrap();
-        assert_eq!(val, '4' as u8);
+        assert_eq!(val, b'4');
         cmdline_address = cmdline_address.unchecked_add(1);
         let val: u8 = gm.read_obj(cmdline_address).unwrap();
-        assert_eq!(val, '\0' as u8);
+        assert_eq!(val, b'\0');
     }
 }

src/loader/x86_64/elf/mod.rs

@@ -578,7 +578,7 @@ mod tests {
 
     #[test]
     fn test_bad_align() {
-        let gm = GuestMemoryMmap::from_ranges(&[(GuestAddress(0x0), (0x10_000_000usize))]).unwrap();
+        let gm = GuestMemoryMmap::from_ranges(&[(GuestAddress(0x0), (0x1000_0000_usize))]).unwrap();
         let bad_align_image = make_bad_align();
         assert_eq!(
             Some(KernelLoaderError::Elf(Error::Align)),