From 869ae330ecfaa3cbd9381c5eee5b6ee8b6090af9 Mon Sep 17 00:00:00 2001
From: Lucas Kent <rubickent@gmail.com>
Date: Thu, 3 Mar 2022 11:59:47 +1100
Subject: Remove remaining usages of nightly features

---
 src/apic/xapic.rs | 8 +++-----
 src/lib.rs        | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/apic/xapic.rs b/src/apic/xapic.rs
index d777478..218e4c5 100644
--- a/src/apic/xapic.rs
+++ b/src/apic/xapic.rs
@@ -3,10 +3,8 @@
 //! Table 10-1 Local APIC Register Address Map
 //! the MMIO base values are found in this file.
 
-use core::fmt;
-use core::intrinsics::{volatile_load, volatile_store};
-
 use bit_field::BitField;
+use core::fmt;
 
 use super::*;
 use crate::msr::{rdmsr, wrmsr, IA32_APIC_BASE, IA32_TSC_DEADLINE};
@@ -306,14 +304,14 @@ impl XAPIC {
     fn read(&self, offset: ApicRegister) -> u32 {
         assert!(offset as usize % 4 == 0);
         let index = offset as usize / 4;
-        unsafe { volatile_load(&self.mmio_region[index]) }
+        unsafe { core::ptr::read_volatile(&self.mmio_region[index]) }
     }
 
     /// write a register in the MMIO region.
     fn write(&mut self, offset: ApicRegister, val: u32) {
         assert!(offset as usize % 4 == 0);
         let index = offset as usize / 4;
-        unsafe { volatile_store(&mut self.mmio_region[index], val) }
+        unsafe { core::ptr::write_volatile(&mut self.mmio_region[index], val) }
     }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
index cda543c..b505446 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,6 +1,4 @@
 #![cfg(any(target_arch = "x86", target_arch = "x86_64"))]
-#![allow(stable_features)]
-#![feature(core_intrinsics)]
 #![no_std]
 #![cfg_attr(test, allow(unused_features))]
 #![cfg_attr(all(test, feature = "vmtest"), feature(custom_test_frameworks))]
-- 
cgit v1.2.3