chore: upgrade to nightly-2024-02-15

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2024-01-15"
+channel = "nightly-2024-02-15"
 components = [
     "llvm-tools",
     "rust-src",

src/arch/riscv64/mm/paging.rs

@@ -340,7 +340,6 @@ struct PageTable<L> {
 /// This additional trait is necessary to make use of Rust's specialization feature and provide a default
 /// implementation of some methods.
 trait PageTableMethods {
-	fn get_page_table_entry<S: PageSize>(&self, page: Page<S>) -> Option<PageTableEntry>;
 	fn map_page_in_this_table<S: PageSize>(
 		&mut self,
 		page: Page<S>,
@@ -390,21 +389,6 @@ impl<L: PageTableLevel> PageTableMethods for PageTable<L> {
 		}
 	}
 
-	/// Returns the PageTableEntry for the given page if it is present, otherwise returns None.
-	///
-	/// This is the default implementation called only for L0Table.
-	/// It is overridden by a specialized implementation for all tables with sub tables (all except L0Table).
-	default fn get_page_table_entry<S: PageSize>(&self, page: Page<S>) -> Option<PageTableEntry> {
-		assert_eq!(L::LEVEL, S::MAP_LEVEL);
-		let index = page.table_index::<L>();
-
-		if self.entries[index].is_present() {
-			Some(self.entries[index])
-		} else {
-			None
-		}
-	}
-
 	/// Maps a single page to the given physical address.
 	///
 	/// This is the default implementation that just calls the map_page_in_this_table method.
@@ -423,26 +407,6 @@ impl<L: PageTableLevelWithSubtables> PageTableMethods for PageTable<L>
 where
 	L::SubtableLevel: PageTableLevel,
 {
-	/// Returns the PageTableEntry for the given page if it is present, otherwise returns None.
-	///
-	/// This is the implementation for all tables with subtables (L1, L2).
-	/// It overrides the default implementation above.
-	fn get_page_table_entry<S: PageSize>(&self, page: Page<S>) -> Option<PageTableEntry> {
-		assert!(L::LEVEL >= S::MAP_LEVEL);
-		let index = page.table_index::<L>();
-
-		if self.entries[index].is_present() {
-			if L::LEVEL > S::MAP_LEVEL {
-				let subtable = self.subtable::<S>(page);
-				subtable.get_page_table_entry::<S>(page)
-			} else {
-				Some(self.entries[index])
-			}
-		} else {
-			None
-		}
-	}
-
 	/// Maps a single page to the given physical address.
 	///
 	/// This is the implementation for all tables with subtables (L1, L2).

src/arch/x86_64/mm/paging.rs

@@ -20,16 +20,20 @@ pub trait PageTableEntryFlagsExt {
 
 	fn normal(&mut self) -> &mut Self;
 
+	#[cfg(feature = "acpi")]
 	fn read_only(&mut self) -> &mut Self;
 
 	fn writable(&mut self) -> &mut Self;
 
 	fn execute_disable(&mut self) -> &mut Self;
 
+	#[cfg(feature = "common-os")]
 	fn execute_enable(&mut self) -> &mut Self;
 
+	#[cfg(feature = "common-os")]
 	fn user(&mut self) -> &mut Self;
 
+	#[cfg(feature = "common-os")]
 	fn kernel(&mut self) -> &mut Self;
 }
 
@@ -44,6 +48,7 @@ impl PageTableEntryFlagsExt for PageTableEntryFlags {
 		self
 	}
 
+	#[cfg(feature = "acpi")]
 	fn read_only(&mut self) -> &mut Self {
 		self.remove(PageTableEntryFlags::WRITABLE);
 		self
@@ -59,16 +64,19 @@ impl PageTableEntryFlagsExt for PageTableEntryFlags {
 		self
 	}
 
+	#[cfg(feature = "common-os")]
 	fn execute_enable(&mut self) -> &mut Self {
 		self.remove(PageTableEntryFlags::NO_EXECUTE);
 		self
 	}
 
+	#[cfg(feature = "common-os")]
 	fn user(&mut self) -> &mut Self {
 		self.insert(PageTableEntryFlags::USER_ACCESSIBLE);
 		self
 	}
 
+	#[cfg(feature = "common-os")]
 	fn kernel(&mut self) -> &mut Self {
 		self.remove(PageTableEntryFlags::USER_ACCESSIBLE);
 		self

src/drivers/net/mod.rs

@@ -42,6 +42,7 @@ pub(crate) trait NetworkDriver {
 	where
 		F: FnOnce(&mut [u8]) -> R;
 	/// Check if a packet is available
+	#[allow(dead_code)]
 	fn has_packet(&self) -> bool;
 	/// Enable / disable the polling mode of the network interface
 	fn set_polling_mode(&mut self, value: bool);

src/drivers/net/virtio_net.rs

@@ -488,6 +488,7 @@ impl NetworkDriver for VirtioNetDriver {
 		self.checksums.clone()
 	}
 
+	#[allow(dead_code)]
 	fn has_packet(&self) -> bool {
 		self.recv_vqs.poll();
 		!self.recv_vqs.poll_queue.borrow().is_empty()

src/drivers/virtio/mod.rs

@@ -95,13 +95,13 @@ pub mod features {
 
 	impl PartialEq<Features> for u64 {
 		fn eq(&self, other: &Features) -> bool {
-			self == other
+			*self == u64::from(*other)
 		}
 	}
 
 	impl PartialEq<u64> for Features {
 		fn eq(&self, other: &u64) -> bool {
-			self == other
+			u64::from(*self) == *other
 		}
 	}
 
@@ -206,7 +206,4 @@ pub mod device {
 			}
 		}
 	}
-
-	/// Empty trait to unify all device specific configuration structs.
-	pub trait DevCfg {}
 }

src/drivers/virtio/virtqueue/mod.rs

@@ -2342,7 +2342,7 @@ impl BitAnd<DescrFlags> for u16 {
 
 impl PartialEq<DescrFlags> for u16 {
 	fn eq(&self, other: &DescrFlags) -> bool {
-		self == other
+		*self == u16::from(*other)
 	}
 }
 

src/executor/mod.rs

@@ -74,8 +74,7 @@ impl Wake for TaskNotify {
 }
 
 pub(crate) fn run() {
-	let waker = Waker::noop();
-	let mut cx = Context::from_waker(&waker);
+	let mut cx = Context::from_waker(Waker::noop());
 
 	without_interrupts(|| {
 		async_tasks().retain_mut(|task| {
@@ -126,8 +125,7 @@ where
 	};
 
 	let start = now();
-	let waker = core::task::Waker::noop();
-	let mut cx = Context::from_waker(&waker);
+	let mut cx = Context::from_waker(Waker::noop());
 	let mut future = pin!(future);
 
 	loop {

src/fd/mod.rs

@@ -179,11 +179,13 @@ pub(crate) trait ObjectInterface: Sync + Send + core::fmt::Debug + DynClone {
 	}
 
 	/// `unlink` removes file entry
+	#[allow(dead_code)]
 	fn unlink(&self, _path: &str) -> Result<(), IoError> {
 		Err(IoError::EINVAL)
 	}
 
 	/// `rmdir` removes directory entry
+	#[allow(dead_code)]
 	fn rmdir(&self, _path: &str) -> Result<(), IoError> {
 		Err(IoError::EINVAL)
 	}
@@ -196,6 +198,7 @@ pub(crate) trait ObjectInterface: Sync + Send + core::fmt::Debug + DynClone {
 	}
 
 	/// `mkdir` creates a directory entry
+	#[allow(dead_code)]
 	fn mkdir(&self, _path: &str, _mode: u32) -> Result<(), IoError> {
 		Err(IoError::EINVAL)
 	}
@@ -244,6 +247,7 @@ pub(crate) trait ObjectInterface: Sync + Send + core::fmt::Debug + DynClone {
 
 	/// `getpeername` get address of connected peer
 	#[cfg(all(any(feature = "tcp", feature = "udp"), not(feature = "newlib")))]
+	#[allow(dead_code)]
 	fn getpeername(&self) -> Option<IpEndpoint> {
 		None
 	}

src/fd/socket/tcp.rs

@@ -28,12 +28,6 @@ fn get_ephemeral_port() -> u16 {
 	LOCAL_ENDPOINT.fetch_add(1, Ordering::SeqCst)
 }
 
-#[derive(Debug)]
-pub struct IPv4;
-
-#[derive(Debug)]
-pub struct IPv6;
-
 #[derive(Debug)]
 pub struct Socket {
 	handle: Handle,
@@ -341,6 +335,7 @@ impl ObjectInterface for Socket {
 		}
 	}
 
+	#[allow(dead_code)]
 	fn getpeername(&self) -> Option<IpEndpoint> {
 		self.with(|socket| socket.remote_endpoint())
 	}

src/fs/fuse_abi.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 #[cfg(all(feature = "fuse", feature = "pci"))]
 pub(crate) const ROOT_ID: u64 = 1;
 

src/lib.rs

@@ -12,7 +12,6 @@
 	allow(incomplete_features)
 )]
 #![cfg_attr(target_arch = "x86_64", feature(abi_x86_interrupt))]
-#![cfg_attr(target_arch = "riscv64", feature(offset_of))]
 #![feature(allocator_api)]
 #![feature(asm_const)]
 #![feature(exposed_provenance)]

src/syscalls/mod.rs

@@ -209,7 +209,7 @@ pub extern "C" fn sys_fstat(fd: FileDescriptor, stat: *mut FileAttr) -> i32 {
 
 extern "C" fn __sys_opendir(name: *const u8) -> FileDescriptor {
 	if let Ok(name) = unsafe { CStr::from_ptr(name as _) }.to_str() {
-		crate::fs::opendir(name).map_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap(), |v| v)
+		crate::fs::opendir(name).unwrap_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap())
 	} else {
 		-crate::errno::EINVAL
 	}
@@ -234,7 +234,7 @@ extern "C" fn __sys_open(name: *const u8, flags: i32, mode: u32) -> FileDescript
 
 	if let Ok(name) = unsafe { CStr::from_ptr(name as _) }.to_str() {
 		crate::fd::open(name, flags, mode)
-			.map_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap(), |v| v)
+			.unwrap_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap())
 	} else {
 		-crate::errno::EINVAL
 	}
@@ -426,7 +426,7 @@ pub extern "C" fn sys_getdents64(fd: FileDescriptor, dirp: *mut Dirent64, count:
 }
 
 extern "C" fn __sys_dup(fd: i32) -> i32 {
-	dup_object(fd).map_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap(), |v| v)
+	dup_object(fd).unwrap_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap())
 }
 
 #[no_mangle]
@@ -464,7 +464,7 @@ pub extern "C" fn sys_poll(fds: *mut PollFd, nfds: usize, timeout: i32) -> i32 {
 extern "C" fn __sys_eventfd(initval: u64, flags: i16) -> i32 {
 	if let Some(flags) = EventFlags::from_bits(flags) {
 		crate::fd::eventfd(initval, flags)
-			.map_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap(), |v| v)
+			.unwrap_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap())
 	} else {
 		-crate::errno::EINVAL
 	}