From 3fc22e2e4c2bf64c9b9a9e47afee3b2a5a49b256 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Sat, 6 Jan 2018 22:38:37 -0800 Subject: [PATCH] Remove core_intrinsics feature Stable versions of these functions now exist under core::ptr, so use those. --- src/io/mmio.rs | 6 +++--- src/lib.rs | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/io/mmio.rs b/src/io/mmio.rs index 1a1d199..b8e7727 100644 --- a/src/io/mmio.rs +++ b/src/io/mmio.rs @@ -1,4 +1,4 @@ -use core::intrinsics::{volatile_load, volatile_store}; +use core::ptr::{read_volatile, write_volatile}; use core::mem::uninitialized; use core::ops::{BitAnd, BitOr, Not}; @@ -22,10 +22,10 @@ impl Io for Mmio where T: Copy + PartialEq + BitAnd + BitOr T { - unsafe { volatile_load(&self.value) } + unsafe { read_volatile(&self.value) } } fn write(&mut self, value: T) { - unsafe { volatile_store(&mut self.value, value) }; + unsafe { write_volatile(&mut self.value, value) }; } } diff --git a/src/lib.rs b/src/lib.rs index d7b96ed..4258c65 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,7 +1,6 @@ #![deny(warnings)] #![feature(asm)] #![feature(const_fn)] -#![feature(core_intrinsics)] #![no_std] pub use self::arch::*;