Various minor fixes for rust 1.79.0

Signed-off-by: Sergio López <[email protected]>

Author: slp

src/arch/src/x86_64/mptable.rs

@@ -90,7 +90,7 @@ const MPC_SIGNATURE: [c_char; 4] = char_array!(c_char; 'P', 'C', 'M', 'P');
 const MPC_SPEC: i8 = 4;
 const MPC_OEM: [c_char; 8] = char_array!(c_char; 'F', 'C', ' ', ' ', ' ', ' ', ' ', ' ');
 const MPC_PRODUCT_ID: [c_char; 12] = ['0' as c_char; 12];
-const BUS_TYPE_ISA: [u8; 6] = char_array!(u8; 'I', 'S', 'A', ' ', ' ', ' ');
+const BUS_TYPE_ISA: [u8; 6] = char_array!(u8; b'I', b'S', b'A', b' ', b' ', b' ');
 const IO_APIC_DEFAULT_PHYS_BASE: u32 = 0xfec0_0000; // source: linux/arch/x86/include/asm/apicdef.h
 const APIC_DEFAULT_PHYS_BASE: u32 = 0xfee0_0000; // source: linux/arch/x86/include/asm/apicdef.h
 const APIC_VERSION: u8 = 0x14;

src/devices/src/virtio/block/worker.rs

@@ -16,6 +16,7 @@ use utils::eventfd::EventFd;
 use virtio_bindings::virtio_blk::*;
 use vm_memory::{ByteValued, GuestMemoryMmap};
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum RequestError {
     FlushingToDisk(io::Error),

src/devices/src/virtio/fs/filesystem.rs

@@ -175,7 +175,7 @@ pub trait ZeroCopyReader {
     fn copy_to_end(&mut self, f: &mut File, mut off: u64) -> io::Result<usize> {
         let mut out = 0;
         loop {
-            match self.read_to(f, ::std::usize::MAX, off) {
+            match self.read_to(f, usize::MAX, off) {
                 Ok(0) => return Ok(out),
                 Ok(n) => {
                     off = off.saturating_add(n as u64);
@@ -268,7 +268,7 @@ pub trait ZeroCopyWriter {
     fn copy_to_end(&mut self, f: &mut File, mut off: u64) -> io::Result<usize> {
         let mut out = 0;
         loop {
-            match self.write_from(f, ::std::usize::MAX, off) {
+            match self.write_from(f, usize::MAX, off) {
                 Ok(0) => return Ok(out),
                 Ok(n) => {
                     off = off.saturating_add(n as u64);

src/devices/src/virtio/fs/linux/passthrough.rs

@@ -1120,13 +1120,13 @@ impl FileSystem for PassthroughFs {
                 attr.st_uid
             } else {
                 // Cannot use -1 here because these are unsigned values.
-                ::std::u32::MAX
+                u32::MAX
             };
             let gid = if valid.contains(SetattrValid::GID) {
                 attr.st_gid
             } else {
                 // Cannot use -1 here because these are unsigned values.
-                ::std::u32::MAX
+                u32::MAX
             };
 
             // Safe because this is a constant value and a valid C string.

src/devices/src/virtio/fs/macos/passthrough.rs

@@ -1169,13 +1169,13 @@ impl FileSystem for PassthroughFs {
                 attr.st_uid
             } else {
                 // Cannot use -1 here because these are unsigned values.
-                ::std::u32::MAX
+                u32::MAX
             };
             let gid = if valid.contains(SetattrValid::GID) {
                 attr.st_gid
             } else {
                 // Cannot use -1 here because these are unsigned values.
-                ::std::u32::MAX
+                u32::MAX
             };
 
             set_xattr_stat(StatFile::Path(&c_path), Some((uid, gid)), None)?;

src/devices/src/virtio/fs/server.rs

@@ -880,8 +880,8 @@ impl<F: FileSystem + Sync> Server<F> {
                     minor: KERNEL_MINOR_VERSION,
                     max_readahead,
                     flags: enabled as u32,
-                    max_background: ::std::u16::MAX,
-                    congestion_threshold: (::std::u16::MAX / 4) * 3,
+                    max_background: u16::MAX,
+                    congestion_threshold: (u16::MAX / 4) * 3,
                     max_write: MAX_BUFFER_SIZE,
                     time_gran: 1, // nanoseconds
                     max_pages: max_pages.try_into().unwrap(),
@@ -1432,7 +1432,7 @@ fn add_dirent(
     d: DirEntry,
     entry: Option<Entry>,
 ) -> io::Result<usize> {
-    if d.name.len() > ::std::u32::MAX as usize {
+    if d.name.len() > u32::MAX as usize {
         return Err(io::Error::from_raw_os_error(libc::EOVERFLOW));
     }
 

src/devices/src/virtio/net/backend.rs

@@ -1,5 +1,6 @@
 use std::os::fd::RawFd;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum ConnectError {
     InvalidAddress(nix::Error),
@@ -8,6 +9,7 @@ pub enum ConnectError {
     SendingMagic(nix::Error),
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum ReadError {
     /// Nothing was written
@@ -16,6 +18,7 @@ pub enum ReadError {
     Internal(nix::Error),
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum WriteError {
     /// Nothing was written, you can drop the frame or try to resend it later

src/devices/src/virtio/vsock/proxy.rs

@@ -14,6 +14,7 @@ pub enum RecvPkt {
     WaitForCredit,
 }
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum ProxyError {
     CreatingSocket(nix::errno::Errno),

src/rutabaga_gfx/src/renderer_utils.rs

@@ -28,6 +28,7 @@ pub fn ret_to_res(ret: i32) -> RutabagaResult<()> {
     }
 }
 
+#[allow(dead_code)]
 pub struct RutabagaCookie {
     pub render_server_fd: Option<SafeDescriptor>,
     pub fence_handler: Option<RutabagaFenceHandler>,