From e1236d484f35909aacb5f76503d2bb184b1f94dd Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 28 Aug 2024 13:53:31 +0200
Subject: [PATCH] simd_extract, simd_insert: use absolute path in macro

---
 crates/core_arch/src/macros.rs         | 6 +++---
 crates/core_arch/src/x86/fma.rs        | 2 +-
 crates/core_arch/src/x86_64/avx.rs     | 2 +-
 crates/core_arch/src/x86_64/avx512f.rs | 1 -
 crates/core_arch/src/x86_64/sse2.rs    | 2 +-
 crates/core_arch/src/x86_64/sse41.rs   | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/crates/core_arch/src/macros.rs b/crates/core_arch/src/macros.rs
index 93eb640079..e2ddcde98a 100644
--- a/crates/core_arch/src/macros.rs
+++ b/crates/core_arch/src/macros.rs
@@ -132,16 +132,16 @@ macro_rules! simd_shuffle {
 #[allow(unused)]
 macro_rules! simd_insert {
     ($x:expr, $idx:expr, $val:expr $(,)?) => {{
-        simd_insert($x, const { $idx }, $val)
+        $crate::intrinsics::simd::simd_insert($x, const { $idx }, $val)
     }};
 }
 
 #[allow(unused)]
 macro_rules! simd_extract {
     ($x:expr, $idx:expr $(,)?) => {{
-        simd_extract($x, const { $idx })
+        $crate::intrinsics::simd::simd_extract($x, const { $idx })
     }};
     ($x:expr, $idx:expr, $ty:ty $(,)?) => {{
-        simd_extract::<_, $ty>($x, const { $idx })
+        $crate::intrinsics::simd::simd_extract::<_, $ty>($x, const { $idx })
     }};
 }
diff --git a/crates/core_arch/src/x86/fma.rs b/crates/core_arch/src/x86/fma.rs
index f3e0728525..7e5b93c839 100644
--- a/crates/core_arch/src/x86/fma.rs
+++ b/crates/core_arch/src/x86/fma.rs
@@ -19,7 +19,7 @@
 //! [wiki_fma]: https://en.wikipedia.org/wiki/Fused_multiply-accumulate
 
 use crate::core_arch::x86::*;
-use crate::intrinsics::simd::{simd_fma, simd_insert, simd_neg};
+use crate::intrinsics::simd::{simd_fma, simd_neg};
 use crate::intrinsics::{fmaf32, fmaf64};
 
 #[cfg(test)]
diff --git a/crates/core_arch/src/x86_64/avx.rs b/crates/core_arch/src/x86_64/avx.rs
index 37f8ef50f8..82f6c0f1a1 100644
--- a/crates/core_arch/src/x86_64/avx.rs
+++ b/crates/core_arch/src/x86_64/avx.rs
@@ -13,7 +13,7 @@
 //! [amd64_ref]: http://support.amd.com/TechDocs/24594.pdf
 //! [wiki]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
 
-use crate::{core_arch::x86::*, intrinsics::simd::*, mem::transmute};
+use crate::{core_arch::x86::*, mem::transmute};
 
 /// Copies `a` to result, and insert the 64-bit integer `i` into result
 /// at the location specified by `index`.
diff --git a/crates/core_arch/src/x86_64/avx512f.rs b/crates/core_arch/src/x86_64/avx512f.rs
index 431d1ba12f..aaa7530e19 100644
--- a/crates/core_arch/src/x86_64/avx512f.rs
+++ b/crates/core_arch/src/x86_64/avx512f.rs
@@ -1,6 +1,5 @@
 use crate::{
     core_arch::{simd::*, x86::*, x86_64::*},
-    intrinsics::simd::*,
     mem::transmute,
 };
 
diff --git a/crates/core_arch/src/x86_64/sse2.rs b/crates/core_arch/src/x86_64/sse2.rs
index 9a99a28876..5c814b0941 100644
--- a/crates/core_arch/src/x86_64/sse2.rs
+++ b/crates/core_arch/src/x86_64/sse2.rs
@@ -1,6 +1,6 @@
 //! `x86_64`'s Streaming SIMD Extensions 2 (SSE2)
 
-use crate::{core_arch::x86::*, intrinsics::simd::*};
+use crate::core_arch::x86::*;
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/crates/core_arch/src/x86_64/sse41.rs b/crates/core_arch/src/x86_64/sse41.rs
index 5c37571ed3..5b6c72e3fc 100644
--- a/crates/core_arch/src/x86_64/sse41.rs
+++ b/crates/core_arch/src/x86_64/sse41.rs
@@ -1,6 +1,6 @@
 //! `i686`'s Streaming SIMD Extensions 4.1 (SSE4.1)
 
-use crate::{core_arch::x86::*, intrinsics::simd::*, mem::transmute};
+use crate::{core_arch::x86::*, mem::transmute};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;