From 975ba7f8537c3771861d31ef4ff931cae814b50e Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Tue, 20 Feb 2024 22:15:33 +0000
Subject: [PATCH] Fix redundant import warnings

These were introduced by rust-lang/rust#117772.
---
 library/stdarch/crates/core_arch/src/x86/avx.rs        | 4 +---
 library/stdarch/crates/core_arch/src/x86/avx2.rs       | 5 +----
 library/stdarch/crates/core_arch/src/x86/avx512bf16.rs | 5 +----
 library/stdarch/crates/core_arch/src/x86/avx512bw.rs   | 3 +--
 library/stdarch/crates/core_arch/src/x86/avx512cd.rs   | 5 +----
 library/stdarch/crates/core_arch/src/x86/avx512f.rs    | 3 +--
 library/stdarch/crates/core_arch/src/x86/avx512vnni.rs | 5 +----
 library/stdarch/crates/core_arch/src/x86/f16c.rs       | 6 +-----
 library/stdarch/crates/core_arch/src/x86/mod.rs        | 4 +++-
 library/stdarch/crates/core_arch/src/x86/sha.rs        | 5 +----
 library/stdarch/crates/core_arch/src/x86/sse.rs        | 2 +-
 library/stdarch/crates/core_arch/src/x86/sse2.rs       | 4 +---
 library/stdarch/crates/core_arch/src/x86/sse3.rs       | 5 +----
 library/stdarch/crates/core_arch/src/x86/sse41.rs      | 5 +----
 library/stdarch/crates/core_arch/src/x86/sse42.rs      | 5 +----
 library/stdarch/crates/core_arch/src/x86/sse4a.rs      | 5 +----
 library/stdarch/crates/core_arch/src/x86/ssse3.rs      | 5 +----
 17 files changed, 19 insertions(+), 57 deletions(-)

diff --git a/library/stdarch/crates/core_arch/src/x86/avx.rs b/library/stdarch/crates/core_arch/src/x86/avx.rs
index 72eb43a5c132..094797e60d76 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx.rs
@@ -15,9 +15,7 @@
 
 use crate::{
     core_arch::{simd::*, simd_llvm::*, x86::*},
-    intrinsics,
-    mem::{self, transmute},
-    ptr,
+    mem, ptr,
 };
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/core_arch/src/x86/avx2.rs b/library/stdarch/crates/core_arch/src/x86/avx2.rs
index 1f7a0b771a04..cdb349eea35d 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx2.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx2.rs
@@ -18,10 +18,7 @@
 //! [wiki_avx]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
 //! [wiki_fma]: https://en.wikipedia.org/wiki/Fused_multiply-accumulate
 
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/avx512bf16.rs b/library/stdarch/crates/core_arch/src/x86/avx512bf16.rs
index bd4ee45182a9..527b1f7664dc 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx512bf16.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx512bf16.rs
@@ -2,10 +2,7 @@
 //!
 //! [AVX512BF16 intrinsics]: https://software.intel.com/sites/landingpage/IntrinsicsGuide/#expand=1769&avx512techs=AVX512_BF16
 
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/avx512bw.rs b/library/stdarch/crates/core_arch/src/x86/avx512bw.rs
index 028acbbdbe11..c40ae0ea8db9 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx512bw.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx512bw.rs
@@ -1,8 +1,7 @@
 use crate::{
     arch::asm,
     core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::{self, transmute},
-    ptr,
+    mem, ptr,
 };
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/core_arch/src/x86/avx512cd.rs b/library/stdarch/crates/core_arch/src/x86/avx512cd.rs
index 99d6daeffbae..0eae29a4e167 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx512cd.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx512cd.rs
@@ -1,7 +1,4 @@
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/avx512f.rs b/library/stdarch/crates/core_arch/src/x86/avx512f.rs
index 6f8e9449d938..90e1d0931912 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx512f.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx512f.rs
@@ -1,8 +1,7 @@
 use crate::{
     arch::asm,
     core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::{self, transmute},
-    ptr,
+    mem, ptr,
 };
 
 // x86-32 wants to use a 32-bit address size, but asm! defaults to using the full
diff --git a/library/stdarch/crates/core_arch/src/x86/avx512vnni.rs b/library/stdarch/crates/core_arch/src/x86/avx512vnni.rs
index ad41b7b2d1ba..13512c9e3681 100644
--- a/library/stdarch/crates/core_arch/src/x86/avx512vnni.rs
+++ b/library/stdarch/crates/core_arch/src/x86/avx512vnni.rs
@@ -1,7 +1,4 @@
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/f16c.rs b/library/stdarch/crates/core_arch/src/x86/f16c.rs
index 88cc78ff6452..5e0a12dd4ca5 100644
--- a/library/stdarch/crates/core_arch/src/x86/f16c.rs
+++ b/library/stdarch/crates/core_arch/src/x86/f16c.rs
@@ -2,11 +2,7 @@
 //!
 //! [F16C intrinsics]: https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=fp16&expand=1769
 
-use crate::{
-    core_arch::{simd::*, x86::*},
-    //    hint::unreachable_unchecked,
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/mod.rs b/library/stdarch/crates/core_arch/src/x86/mod.rs
index 1421f6b0893a..835bb26e1165 100644
--- a/library/stdarch/crates/core_arch/src/x86/mod.rs
+++ b/library/stdarch/crates/core_arch/src/x86/mod.rs
@@ -1,6 +1,8 @@
 //! `x86` and `x86_64` intrinsics.
 
-use crate::{intrinsics, marker::Sized, mem::transmute};
+#[allow(unused_imports)]
+use crate::marker::Sized;
+use crate::{intrinsics, mem::transmute};
 
 #[macro_use]
 mod macros;
diff --git a/library/stdarch/crates/core_arch/src/x86/sha.rs b/library/stdarch/crates/core_arch/src/x86/sha.rs
index 5c5e81ba90ec..90127398cd21 100644
--- a/library/stdarch/crates/core_arch/src/x86/sha.rs
+++ b/library/stdarch/crates/core_arch/src/x86/sha.rs
@@ -1,7 +1,4 @@
-use crate::{
-    core_arch::{simd::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, x86::*};
 
 #[allow(improper_ctypes)]
 extern "C" {
diff --git a/library/stdarch/crates/core_arch/src/x86/sse.rs b/library/stdarch/crates/core_arch/src/x86/sse.rs
index 1e1a219bd6fd..0f64e8cea89a 100644
--- a/library/stdarch/crates/core_arch/src/x86/sse.rs
+++ b/library/stdarch/crates/core_arch/src/x86/sse.rs
@@ -2,7 +2,7 @@
 
 use crate::{
     core_arch::{simd::*, simd_llvm::*, x86::*},
-    intrinsics, mem, ptr,
+    mem, ptr,
 };
 
 #[cfg(test)]
diff --git a/library/stdarch/crates/core_arch/src/x86/sse2.rs b/library/stdarch/crates/core_arch/src/x86/sse2.rs
index d1bb92ce6a17..15ae53d67ebd 100644
--- a/library/stdarch/crates/core_arch/src/x86/sse2.rs
+++ b/library/stdarch/crates/core_arch/src/x86/sse2.rs
@@ -5,9 +5,7 @@ use stdarch_test::assert_instr;
 
 use crate::{
     core_arch::{simd::*, simd_llvm::*, x86::*},
-    intrinsics,
-    mem::{self, transmute},
-    ptr,
+    mem, ptr,
 };
 
 /// Provides a hint to the processor that the code sequence is a spin-wait loop.
diff --git a/library/stdarch/crates/core_arch/src/x86/sse3.rs b/library/stdarch/crates/core_arch/src/x86/sse3.rs
index df0d78e5bfd1..889b90b56105 100644
--- a/library/stdarch/crates/core_arch/src/x86/sse3.rs
+++ b/library/stdarch/crates/core_arch/src/x86/sse3.rs
@@ -1,9 +1,6 @@
 //! Streaming SIMD Extensions 3 (SSE3)
 
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/sse41.rs b/library/stdarch/crates/core_arch/src/x86/sse41.rs
index 7fc3c794283b..386bc5195070 100644
--- a/library/stdarch/crates/core_arch/src/x86/sse41.rs
+++ b/library/stdarch/crates/core_arch/src/x86/sse41.rs
@@ -1,9 +1,6 @@
 //! Streaming SIMD Extensions 4.1 (SSE4.1)
 
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/sse42.rs b/library/stdarch/crates/core_arch/src/x86/sse42.rs
index 76a6a40757a3..96036df7441a 100644
--- a/library/stdarch/crates/core_arch/src/x86/sse42.rs
+++ b/library/stdarch/crates/core_arch/src/x86/sse42.rs
@@ -5,10 +5,7 @@
 #[cfg(test)]
 use stdarch_test::assert_instr;
 
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 /// String contains unsigned 8-bit characters *(Default)*
 #[stable(feature = "simd_x86", since = "1.27.0")]
diff --git a/library/stdarch/crates/core_arch/src/x86/sse4a.rs b/library/stdarch/crates/core_arch/src/x86/sse4a.rs
index b5e42b133f25..84d4e7c2d07c 100644
--- a/library/stdarch/crates/core_arch/src/x86/sse4a.rs
+++ b/library/stdarch/crates/core_arch/src/x86/sse4a.rs
@@ -1,9 +1,6 @@
 //! `i686`'s Streaming SIMD Extensions 4a (`SSE4a`)
 
-use crate::{
-    core_arch::{simd::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;
diff --git a/library/stdarch/crates/core_arch/src/x86/ssse3.rs b/library/stdarch/crates/core_arch/src/x86/ssse3.rs
index 4957c2b1ea02..a8cc21bfe396 100644
--- a/library/stdarch/crates/core_arch/src/x86/ssse3.rs
+++ b/library/stdarch/crates/core_arch/src/x86/ssse3.rs
@@ -1,9 +1,6 @@
 //! Supplemental Streaming SIMD Extensions 3 (SSSE3)
 
-use crate::{
-    core_arch::{simd::*, simd_llvm::*, x86::*},
-    mem::transmute,
-};
+use crate::core_arch::{simd::*, simd_llvm::*, x86::*};
 
 #[cfg(test)]
 use stdarch_test::assert_instr;