From 6405058a6f133470a10fe65082fce4a0df57d4ab Mon Sep 17 00:00:00 2001
From: Amanieu d'Antras <amanieu@gmail.com>
Date: Tue, 13 Apr 2021 04:31:37 +0100
Subject: [PATCH] Don't import from core (#1115)

This breaks when core_arch is included as a module in core.
---
 library/stdarch/crates/core_arch/src/aarch64/neon/mod.rs | 2 +-
 library/stdarch/crates/core_arch/src/arm/neon/mod.rs     | 4 ++--
 library/stdarch/crates/core_arch/src/lib.rs              | 2 +-
 library/stdarch/crates/stdarch-verify/tests/arm.rs       | 8 +++++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/library/stdarch/crates/core_arch/src/aarch64/neon/mod.rs b/library/stdarch/crates/core_arch/src/aarch64/neon/mod.rs
index 26971a54ddb9..a925fbc5043b 100644
--- a/library/stdarch/crates/core_arch/src/aarch64/neon/mod.rs
+++ b/library/stdarch/crates/core_arch/src/aarch64/neon/mod.rs
@@ -11,11 +11,11 @@ pub use self::generated::*;
 
 use crate::{
     core_arch::{arm::*, simd::*, simd_llvm::*},
+    hint::unreachable_unchecked,
     mem::{transmute, zeroed},
 };
 #[cfg(test)]
 use stdarch_test::assert_instr;
-use core::hint::unreachable_unchecked;
 
 types! {
     /// ARM-specific 64-bit wide vector of one packed `f64`.
diff --git a/library/stdarch/crates/core_arch/src/arm/neon/mod.rs b/library/stdarch/crates/core_arch/src/arm/neon/mod.rs
index a0bfb2f556d9..02a58c1e870a 100644
--- a/library/stdarch/crates/core_arch/src/arm/neon/mod.rs
+++ b/library/stdarch/crates/core_arch/src/arm/neon/mod.rs
@@ -8,9 +8,9 @@ pub use self::generated::*;
 #[cfg(target_arch = "arm")]
 use crate::mem::align_of;
 use crate::{
-    core_arch::simd::*, core_arch::simd_llvm::*, hint::unreachable_unchecked, mem::transmute,
+    convert::TryInto, core_arch::simd::*, core_arch::simd_llvm::*, hint::unreachable_unchecked,
+    mem::transmute,
 };
-use core::convert::TryInto;
 #[cfg(test)]
 use stdarch_test::assert_instr;
 
diff --git a/library/stdarch/crates/core_arch/src/lib.rs b/library/stdarch/crates/core_arch/src/lib.rs
index 6e273bda281f..5e1012fa1e16 100644
--- a/library/stdarch/crates/core_arch/src/lib.rs
+++ b/library/stdarch/crates/core_arch/src/lib.rs
@@ -75,4 +75,4 @@ mod core_arch;
 pub use self::core_arch::arch;
 
 #[allow(unused_imports)]
-use core::{ffi, hint, intrinsics, marker, mem, ops, ptr, sync};
+use core::{convert, ffi, hint, intrinsics, marker, mem, ops, ptr, sync};
diff --git a/library/stdarch/crates/stdarch-verify/tests/arm.rs b/library/stdarch/crates/stdarch-verify/tests/arm.rs
index 03972c0c4bd7..9f0d9814853c 100644
--- a/library/stdarch/crates/stdarch-verify/tests/arm.rs
+++ b/library/stdarch/crates/stdarch-verify/tests/arm.rs
@@ -396,7 +396,13 @@ fn verify_all_signatures() {
         }
         // Skip some intrinsics that are present in GCC and Clang but
         // are missing from the official documentation.
-        let skip_intrinsic_verify = ["vmov_n_p64", "vmovq_n_p64", "vreinterpret_p64_s64", "vreinterpret_f32_p64", "vreinterpretq_f32_p64"];
+        let skip_intrinsic_verify = [
+            "vmov_n_p64",
+            "vmovq_n_p64",
+            "vreinterpret_p64_s64",
+            "vreinterpret_f32_p64",
+            "vreinterpretq_f32_p64",
+        ];
         let arm = match map.get(rust.name) {
             Some(i) => i,
             None => {