Skip to content

Commit 7580265

Browse files
authored
Don't import from core (rust-lang#1115)
This breaks when core_arch is included as a module in core.
1 parent f3d5e7d commit 7580265

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

crates/core_arch/src/aarch64/neon/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ pub use self::generated::*;
1111

1212
use crate::{
1313
core_arch::{arm::*, simd::*, simd_llvm::*},
14+
hint::unreachable_unchecked,
1415
mem::{transmute, zeroed},
1516
};
1617
#[cfg(test)]
1718
use stdarch_test::assert_instr;
18-
use core::hint::unreachable_unchecked;
1919

2020
types! {
2121
/// ARM-specific 64-bit wide vector of one packed `f64`.

crates/core_arch/src/arm/neon/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ pub use self::generated::*;
88
#[cfg(target_arch = "arm")]
99
use crate::mem::align_of;
1010
use crate::{
11-
core_arch::simd::*, core_arch::simd_llvm::*, hint::unreachable_unchecked, mem::transmute,
11+
convert::TryInto, core_arch::simd::*, core_arch::simd_llvm::*, hint::unreachable_unchecked,
12+
mem::transmute,
1213
};
13-
use core::convert::TryInto;
1414
#[cfg(test)]
1515
use stdarch_test::assert_instr;
1616

crates/core_arch/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ mod core_arch;
7575
pub use self::core_arch::arch;
7676

7777
#[allow(unused_imports)]
78-
use core::{ffi, hint, intrinsics, marker, mem, ops, ptr, sync};
78+
use core::{convert, ffi, hint, intrinsics, marker, mem, ops, ptr, sync};

crates/stdarch-verify/tests/arm.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,13 @@ fn verify_all_signatures() {
396396
}
397397
// Skip some intrinsics that are present in GCC and Clang but
398398
// are missing from the official documentation.
399-
let skip_intrinsic_verify = ["vmov_n_p64", "vmovq_n_p64", "vreinterpret_p64_s64", "vreinterpret_f32_p64", "vreinterpretq_f32_p64"];
399+
let skip_intrinsic_verify = [
400+
"vmov_n_p64",
401+
"vmovq_n_p64",
402+
"vreinterpret_p64_s64",
403+
"vreinterpret_f32_p64",
404+
"vreinterpretq_f32_p64",
405+
];
400406
let arm = match map.get(rust.name) {
401407
Some(i) => i,
402408
None => {

0 commit comments

Comments
 (0)