aboutsummaryrefslogtreecommitdiff
path: root/src/lib.rs
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2020-05-05 18:09:16 +0000
committerGravatar GitHub <noreply@github.com> 2020-05-05 18:09:16 +0000
commit1e29ce53785d028e9ca6a51aee2f0cc5cf505635 (patch)
tree4798c33223aa215c7fe3e4b303d80f3241fb5d88 /src/lib.rs
parentd677abee20eff72ad0b8d9b7a33e1f0ae9fd73a8 (diff)
parent7e551e6978536f7889b04d754a2e890993281a94 (diff)
downloadcortex-m-1e29ce53785d028e9ca6a51aee2f0cc5cf505635.tar.gz
cortex-m-1e29ce53785d028e9ca6a51aee2f0cc5cf505635.tar.zst
cortex-m-1e29ce53785d028e9ca6a51aee2f0cc5cf505635.zip
Merge #210
210: Use llmv_asm! macro for inline assembly r=jonas-schievink a=stianeklund Fixes #204 the `asm!` macro will soon be deprecated. This changes all of the `asm!` calls to `llvm_asm!` To my knowledge doing a direct replacement should be fine. Co-authored-by: Stian Eklund <stian.eklund@gmail.com>
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib.rs b/src/lib.rs
index aedb95a..89f420d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -12,7 +12,7 @@
//! ## `inline-asm`
//!
//! When this feature is enabled the implementation of all the functions inside the `asm` and
-//! `register` modules use inline assembly (`asm!`) instead of external assembly (FFI into separate
+//! `register` modules use inline assembly (`llvm_asm!`) instead of external assembly (FFI into separate
//! assembly files pre-compiled using `arm-none-eabi-gcc`). The advantages of enabling `inline-asm`
//! are:
//!
@@ -29,7 +29,7 @@
//! This crate is guaranteed to compile on stable Rust 1.31 and up. It *might*
//! compile with older versions but that may change in any new patch release.
-#![cfg_attr(feature = "inline-asm", feature(asm))]
+#![cfg_attr(feature = "inline-asm", feature(llvm_asm))]
#![deny(missing_docs)]
#![no_std]
#![allow(clippy::identity_op)]