rust-toolchain: Fix warnings on new toolchain

- &Trait -> &dyn Trait
- Remove unneeded parens

Signed-off-by: Joe Richey <joerichey@google.com>

Author: josephlr

src/block.rs

@@ -70,7 +70,7 @@ struct UsedElem {
 #[cfg(not(test))]
 /// Device driver for virtio block over any transport
 pub struct VirtioBlockDevice<'a> {
-    transport: &'a mut VirtioTransport,
+    transport: &'a mut dyn VirtioTransport,
     state: RefCell<DriverState>,
 }
 
@@ -131,7 +131,7 @@ enum RequestType {
 
 #[cfg(not(test))]
 impl<'a> VirtioBlockDevice<'a> {
-    pub fn new(transport: &'a mut VirtioTransport) -> VirtioBlockDevice<'a> {
+    pub fn new(transport: &'a mut dyn VirtioTransport) -> VirtioBlockDevice<'a> {
         VirtioBlockDevice {
             transport,
             state: RefCell::new(DriverState::default()),

src/bzimage.rs

@@ -56,7 +56,7 @@ struct E820Entry {
 }
 
 #[cfg(not(test))]
-pub fn load_initrd(f: &mut Read) -> Result<(), Error> {
+pub fn load_initrd(f: &mut dyn Read) -> Result<(), Error> {
     let mut zero_page = crate::mem::MemoryRegion::new(ZERO_PAGE_START as u64, 4096);
 
     let mut max_load_address = u64::from(zero_page.read_u32(0x22c));
@@ -147,7 +147,7 @@ pub fn append_commandline(addition: &str) -> Result<(), Error> {
 }
 
 #[cfg(not(test))]
-pub fn load_kernel(f: &mut Read) -> Result<(u64), Error> {
+pub fn load_kernel(f: &mut dyn Read) -> Result<u64, Error> {
     f.seek(0)?;
 
     let mut buf: [u8; 1024] = [0; 1024];

src/fat.rs

@@ -90,7 +90,7 @@ enum FatType {
 }
 
 pub struct Filesystem<'a> {
-    device: &'a SectorRead,
+    device: &'a dyn SectorRead,
     start: u64,
     last: u64,
     bytes_per_sector: u32,
@@ -374,7 +374,7 @@ fn compare_name(name: &str, de: &DirectoryEntry) -> bool {
 }
 
 impl<'a> Filesystem<'a> {
-    pub fn new(device: &'a SectorRead, start: u64, last: u64) -> Filesystem {
+    pub fn new(device: &'a dyn SectorRead, start: u64, last: u64) -> Filesystem {
         Filesystem {
             device,
             start,

src/loader.rs

@@ -126,7 +126,7 @@ fn default_entry_path(fs: &fat::Filesystem) -> Result<[u8; 260], fat::Error> {
 }
 
 #[cfg(not(test))]
-pub fn load_default_entry(fs: &fat::Filesystem) -> Result<(u64), Error> {
+pub fn load_default_entry(fs: &fat::Filesystem) -> Result<u64, Error> {
     let default_entry_path = default_entry_path(&fs)?;
     let default_entry_path = ascii_strip(&default_entry_path);
 

src/part.rs

@@ -68,7 +68,7 @@ pub enum Error {
     NoEFIPartition,
 }
 
-pub fn get_partitions(r: &SectorRead, parts_out: &mut [PartitionEntry]) -> Result<u32, Error> {
+pub fn get_partitions(r: &dyn SectorRead, parts_out: &mut [PartitionEntry]) -> Result<u32, Error> {
     let mut data: [u8; 512] = [0; 512];
     match r.read(1, &mut data) {
         Ok(_) => {}
@@ -123,7 +123,7 @@ pub fn get_partitions(r: &SectorRead, parts_out: &mut [PartitionEntry]) -> Resul
 }
 
 /// Find EFI partition
-pub fn find_efi_partition(r: &SectorRead) -> Result<(u64, u64), Error> {
+pub fn find_efi_partition(r: &dyn SectorRead) -> Result<(u64, u64), Error> {
     // Assume no more than 16 partitions on the disk
     let mut parts: [PartitionEntry; 16] = unsafe { core::mem::zeroed() };
 

src/pe.rs

@@ -15,7 +15,7 @@
 use crate::mem::MemoryRegion;
 
 pub struct Loader<'a> {
-    file: &'a mut crate::fat::Read,
+    file: &'a mut dyn crate::fat::Read,
     num_sections: u16,
     image_base: u64,
     image_size: u32,
@@ -38,7 +38,7 @@ struct Section {
 }
 
 impl<'a> Loader<'a> {
-    pub fn new(file: &'a mut crate::fat::Read) -> Loader {
+    pub fn new(file: &'a mut dyn crate::fat::Read) -> Loader {
         Loader {
             file,
             num_sections: 0,