From 26f6f5bda2d24abc53f03548bfbe96fc836d668d Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Wed, 10 Jan 2024 09:43:39 +0000
Subject: [PATCH] Remove #![feature(feature)] from crates/sel4-hal-adapters

Signed-off-by: Nick Spinale <nick@nickspinale.com>
---
 crates/sel4-hal-adapters/src/lib.rs                 |  1 -
 crates/sel4-hal-adapters/src/smoltcp/phy/handler.rs | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/sel4-hal-adapters/src/lib.rs b/crates/sel4-hal-adapters/src/lib.rs
index c719a8218..cfddfafdd 100644
--- a/crates/sel4-hal-adapters/src/lib.rs
+++ b/crates/sel4-hal-adapters/src/lib.rs
@@ -6,7 +6,6 @@
 //
 
 #![no_std]
-#![feature(never_type)]
 
 #[cfg(feature = "smoltcp-hal")]
 pub mod smoltcp;
diff --git a/crates/sel4-hal-adapters/src/smoltcp/phy/handler.rs b/crates/sel4-hal-adapters/src/smoltcp/phy/handler.rs
index ad591d3bc..a71995866 100644
--- a/crates/sel4-hal-adapters/src/smoltcp/phy/handler.rs
+++ b/crates/sel4-hal-adapters/src/smoltcp/phy/handler.rs
@@ -15,7 +15,7 @@ use smoltcp::{
 use serde::{Deserialize, Serialize};
 
 use sel4_externally_shared::ExternallySharedRef;
-use sel4_microkit::{Channel, Handler, MessageInfo};
+use sel4_microkit::{Channel, Handler, Infallible, MessageInfo};
 use sel4_microkit_message::MessageInfoExt as _;
 use sel4_shared_ring_buffer::{roles::Use, RingBuffers};
 
@@ -44,8 +44,8 @@ pub struct PhyDeviceHandler<Device> {
     dev: Device,
     client_region: ExternallySharedRef<'static, [u8]>,
     client_region_paddr: usize,
-    rx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), !>>,
-    tx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), !>>,
+    rx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), Infallible>>,
+    tx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), Infallible>>,
     device_channel: Channel,
     client_channel: Channel,
 }
@@ -55,8 +55,8 @@ impl<Device> PhyDeviceHandler<Device> {
         dev: Device,
         client_region: ExternallySharedRef<'static, [u8]>,
         client_region_paddr: usize,
-        rx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), !>>,
-        tx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), !>>,
+        rx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), Infallible>>,
+        tx_ring_buffers: RingBuffers<'static, Use, fn() -> Result<(), Infallible>>,
         device_channel: Channel,
         client_channel: Channel,
     ) -> Self {
@@ -75,7 +75,7 @@ impl<Device> PhyDeviceHandler<Device> {
 }
 
 impl<Device: phy::Device + IrqAck + HasMac> Handler for PhyDeviceHandler<Device> {
-    type Error = !;
+    type Error = Infallible;
 
     fn notified(&mut self, channel: Channel) -> Result<(), Self::Error> {
         if channel == self.device_channel || channel == self.client_channel {