From f2ab30543ce870c2db31db32d2c5d9e8be6b4860 Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Sun, 19 Dec 2021 19:56:33 +0100
Subject: [PATCH] Fix build on latest nightly

asm! is now stable.
---
 src/elision.rs | 2 ++
 src/lib.rs     | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/elision.rs b/src/elision.rs
index dae39cb5..613aaf4e 100644
--- a/src/elision.rs
+++ b/src/elision.rs
@@ -5,6 +5,8 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
+#[cfg(all(feature = "nightly", any(target_arch = "x86", target_arch = "x86_64")))]
+use std::arch::asm;
 use std::sync::atomic::AtomicUsize;
 
 // Extension trait to add lock elision primitives to atomic types
diff --git a/src/lib.rs b/src/lib.rs
index 27b41a87..03639a68 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,7 +11,6 @@
 
 #![warn(missing_docs)]
 #![warn(rust_2018_idioms)]
-#![cfg_attr(feature = "nightly", feature(asm))]
 
 mod condvar;
 mod elision;