Merge #399

399: Fix clippy lints r=stlankes a=mkroening

See #397.

Co-authored-by: Martin Kröning <[email protected]>

Author: bors[bot]

src/arch/x86_64/kernel/mmio.rs

@@ -11,10 +11,10 @@ use crate::synch::spinlock::SpinlockIrqSave;
 use alloc::vec::Vec;
 use core::str;
 
-pub const MAGIC_VALUE: u32 = 0x74726976 as u32;
+pub const MAGIC_VALUE: u32 = 0x74726976;
 
-pub const MMIO_START: usize = 0x00000000c0000000 as usize;
-pub const MMIO_END: usize = 0x00000000c0000fff as usize;
+pub const MMIO_START: usize = 0x00000000c0000000;
+pub const MMIO_END: usize = 0x00000000c0000fff;
 const IRQ_NUMBER: u32 = 12;
 
 static mut MMIO_DRIVERS: Vec<MmioDriver> = Vec::new();

src/arch/x86_64/kernel/pci.rs

@@ -1,3 +1,5 @@
+use num_derive::{FromPrimitive, ToPrimitive};
+
 use crate::arch::x86_64::mm::{PhysAddr, VirtAddr};
 use crate::collections::irqsave;
 use crate::drivers::net::rtl8139::{self, RTL8139Driver};

src/arch/x86_64/kernel/vga.rs

@@ -25,8 +25,8 @@ struct VgaCharacter {
 impl VgaCharacter {
 	const fn new(character: u8, attribute: u8) -> Self {
 		Self {
-			character: character,
-			attribute: attribute,
+			character,
+			attribute,
 		}
 	}
 }

src/drivers/net/rtl8139.rs

@@ -12,7 +12,7 @@ use crate::arch::kernel::percore::increment_irq_counter;
 use crate::arch::mm::paging::virt_to_phys;
 use crate::arch::mm::VirtAddr;
 use crate::drivers::error::DriverError;
-use crate::drivers::net::{netwakeup, network_irqhandler, NetworkInterface};
+use crate::drivers::net::{network_irqhandler, NetworkInterface};
 use crate::x86::io::*;
 
 /// size of the receive buffer
@@ -351,7 +351,7 @@ impl NetworkInterface for RTL8139Driver {
 		if ret {
 			// handle incoming packets
 			#[cfg(not(feature = "newlib"))]
-			netwakeup();
+			crate::drivers::net::netwakeup();
 		}
 
 		unsafe {

src/drivers/net/virtio_mmio.rs

@@ -58,9 +58,8 @@ impl NetDevCfgRaw {
 			loop {
 				let before = read_volatile(&self.config_generation);
 				_mm_mfence();
-				for i in 0..6 {
-					mac[i] = read_volatile(&self.mac[i]);
-				}
+				let mut src = self.mac.iter();
+				mac.fill_with(|| read_volatile(src.next().unwrap()));
 				_mm_mfence();
 				let after = read_volatile(&self.config_generation);
 
@@ -117,17 +116,17 @@ impl VirtioNetDriver {
 			unsafe { &*(((registers as *const _ as usize) + 0xFC) as *const NetDevCfgRaw) };
 		let dev_cfg = NetDevCfg {
 			raw: dev_cfg_raw,
-			dev_id: dev_id,
+			dev_id,
 			features: FeatureSet::new(0),
 		};
 		let isr_stat = IsrStatus::new(registers);
 		let notif_cfg = NotifCfg::new(registers);
 
 		Ok(VirtioNetDriver {
-			dev_cfg: dev_cfg,
+			dev_cfg,
 			com_cfg: ComCfg::new(registers, 1),
-			isr_stat: isr_stat,
-			notif_cfg: notif_cfg,
+			isr_stat,
+			notif_cfg,
 			ctrl_vq: CtrlQueue::new(None),
 			recv_vqs: RxQueues::new(
 				Vec::<Rc<Virtq>>::new(),
@@ -141,7 +140,7 @@ impl VirtioNetDriver {
 				false,
 			),
 			num_vqs: 0,
-			irq: irq,
+			irq,
 		})
 	}
 

src/drivers/virtio/transport/mmio.rs

@@ -26,7 +26,7 @@ use crate::drivers::net::network_irqhandler;
 // one MUST adjust the associated From<u32>
 // implementation, in order catch all cases correctly,
 // as this function uses the catch-all "_" case!
-#[allow(non_camel_case_types)]
+#[allow(non_camel_case_types, clippy::upper_case_acronyms)]
 #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone, Copy)]
 #[repr(u32)]
 pub enum DevId {
@@ -136,8 +136,8 @@ impl ComCfg {
 		self.com_cfg.get_max_queue_size(sel)
 	}
 
-	pub fn is_queue_ready(&mut self, sel: u32) -> bool {
-		self.com_cfg.is_queue_ready(sel)
+	pub fn get_queue_ready(&mut self, sel: u32) -> bool {
+		self.com_cfg.get_queue_ready(sel)
 	}
 
 	/// Returns the device status field.
@@ -314,7 +314,7 @@ impl IsrStatus {
 		let ptr = &mut registers.interrupt_status as *mut _;
 		let raw: &'static mut IsrStatusRaw = unsafe { &mut *(ptr as *mut IsrStatusRaw) };
 
-		IsrStatus { raw: raw }
+		IsrStatus { raw }
 	}
 
 	pub fn is_interrupt(&self) -> bool {
@@ -508,7 +508,7 @@ impl MmioRegisterLayout {
 		}
 	}
 
-	pub fn is_queue_ready(&mut self, sel: u32) -> bool {
+	pub fn get_queue_ready(&mut self, sel: u32) -> bool {
 		unsafe {
 			write_volatile(&mut self.queue_sel, sel);
 			read_volatile(&self.queue_ready) != 0

src/lib.rs

@@ -46,8 +46,6 @@ extern crate alloc;
 extern crate bitflags;
 #[macro_use]
 extern crate log;
-#[macro_use]
-extern crate num_derive;
 #[cfg(not(any(target_os = "none", target_os = "hermit")))]
 #[macro_use]
 extern crate std;

src/syscalls/lwip.rs

@@ -5,7 +5,7 @@ use crate::synch::spinlock::SpinlockIrqSaveGuard;
 
 /// Enables lwIP's printf to print a whole string without being interrupted by
 /// a message from the kernel.
-static mut CONSOLE_GUARD: Option<SpinlockIrqSaveGuard<console::Console>> = None;
+static mut CONSOLE_GUARD: Option<SpinlockIrqSaveGuard<'_, console::Console>> = None;
 
 extern "C" fn __sys_lwip_get_errno() -> i32 {
 	core_scheduler().get_lwip_errno()