Skip to content

Commit 050415f

Browse files
committed
Merge imports
1 parent 6951746 commit 050415f

File tree

14 files changed

+54
-60
lines changed

14 files changed

+54
-60
lines changed

crates/core_arch/src/acle/dsp.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,11 @@ pub unsafe fn __smlawt(a: i32, b: int16x2_t, c: i32) -> i32 {
236236

237237
#[cfg(test)]
238238
mod tests {
239-
use crate::core_arch::arm::*;
240-
use crate::core_arch::simd::{i16x2, i8x4, u8x4};
241-
use std::i32;
242-
use std::mem::transmute;
239+
use crate::core_arch::{
240+
arm::*,
241+
simd::{i16x2, i8x4, u8x4},
242+
};
243+
use std::{i32, mem::transmute};
243244
use stdsimd_test::simd_test;
244245

245246
#[test]

crates/core_arch/src/acle/simd32.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@
6565
#[cfg(test)]
6666
use stdsimd_test::assert_instr;
6767

68-
use crate::core_arch::acle::dsp::int16x2_t;
69-
use crate::mem::transmute;
68+
use crate::{core_arch::acle::dsp::int16x2_t, mem::transmute};
7069

7170
types! {
7271
/// ARM-specific 32-bit wide vector of four packed `i8`.
@@ -465,9 +464,7 @@ pub unsafe fn __usada8(a: int8x4_t, b: int8x4_t, c: u32) -> u32 {
465464
#[cfg(test)]
466465
mod tests {
467466
use crate::core_arch::simd::{i16x2, i8x4, u8x4};
468-
use std::i16;
469-
use std::i8;
470-
use std::mem::transmute;
467+
use std::{i16, i8, mem::transmute};
471468
use stdsimd_test::simd_test;
472469

473470
#[test]

crates/core_arch/src/arm/neon.rs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -977,13 +977,7 @@ pub unsafe fn vtbx4_p8(a: poly8x8_t, b: poly8x8x4_t, c: uint8x8_t) -> poly8x8_t
977977
#[cfg(test)]
978978
mod tests {
979979
use crate::core_arch::{arm::*, simd::*};
980-
use std::i16;
981-
use std::i32;
982-
use std::i8;
983-
use std::mem::transmute;
984-
use std::u16;
985-
use std::u32;
986-
use std::u8;
980+
use std::{i16, i32, i8, mem::transmute, u16, u32, u8};
987981
use stdsimd_test::simd_test;
988982

989983
#[simd_test(enable = "neon")]

crates/core_arch/src/mips/msa.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9230,11 +9230,11 @@ pub unsafe fn __msa_xori_b(a: v16u8, imm8: i32) -> v16u8 {
92309230

92319231
#[cfg(test)]
92329232
mod tests {
9233-
use crate::core_arch::mips::msa::*;
9234-
use crate::mem;
9235-
use crate::core_arch::simd::*;
9236-
use std::f32;
9237-
use std::f64;
9233+
use crate::{
9234+
core_arch::{mips::msa::*, simd::*},
9235+
mem,
9236+
};
9237+
use std::{f32, f64};
92389238
use stdsimd_test::simd_test;
92399239

92409240
#[simd_test(enable = "msa")]

crates/core_arch/src/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ pub mod arch {
5656
#[doc(cfg(target_arch = "aarch64"))]
5757
#[unstable(feature = "stdsimd", issue = "27731")]
5858
pub mod aarch64 {
59-
pub use crate::core_arch::aarch64::*;
60-
pub use crate::core_arch::arm::*;
59+
pub use crate::core_arch::{aarch64::*, arm::*};
6160
}
6261

6362
/// Platform-specific intrinsics for the `wasm32` platform.

crates/core_arch/src/x86/sha.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,17 @@ pub unsafe fn _mm_sha256rnds2_epu32(a: __m128i, b: __m128i, k: __m128i) -> __m12
130130

131131
#[cfg(test)]
132132
mod tests {
133-
use std::f32;
134-
use std::f64::{self, NAN};
135-
use std::i32;
136-
use std::mem::{self, transmute};
137-
138-
use crate::core_arch::{simd::*, x86::*};
139-
use crate::hint::black_box;
133+
use std::{
134+
f32,
135+
f64::{self, NAN},
136+
i32,
137+
mem::{self, transmute},
138+
};
139+
140+
use crate::{
141+
core_arch::{simd::*, x86::*},
142+
hint::black_box,
143+
};
140144
use stdsimd_test::simd_test;
141145

142146
#[simd_test(enable = "sha")]

crates/core_arch/src/x86/sse.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2497,10 +2497,8 @@ pub unsafe fn _mm_cvtps_pi8(a: __m128) -> __m64 {
24972497

24982498
#[cfg(test)]
24992499
mod tests {
2500-
use crate::hint::black_box;
2501-
use crate::mem::transmute;
2502-
use std::boxed;
2503-
use std::f32::NAN;
2500+
use crate::{hint::black_box, mem::transmute};
2501+
use std::{boxed, f32::NAN};
25042502
use stdsimd_test::simd_test;
25052503

25062504
use crate::core_arch::{simd::*, x86::*};

crates/core_arch/src/x86/sse2.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3183,13 +3183,16 @@ extern "C" {
31833183

31843184
#[cfg(test)]
31853185
mod tests {
3186-
use crate::core_arch::{simd::*, x86::*};
3187-
use crate::hint::black_box;
3188-
use std::boxed;
3189-
use std::f32;
3190-
use std::f64::{self, NAN};
3191-
use std::i32;
3192-
use std::mem::{self, transmute};
3186+
use crate::{
3187+
core_arch::{simd::*, x86::*},
3188+
hint::black_box,
3189+
};
3190+
use std::{
3191+
boxed, f32,
3192+
f64::{self, NAN},
3193+
i32,
3194+
mem::{self, transmute},
3195+
};
31933196
use stdsimd_test::simd_test;
31943197

31953198
#[test]

crates/core_arch/src/x86/xsave.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ pub unsafe fn _xrstors(mem_addr: *const u8, rs_mask: u64) {
162162

163163
#[cfg(test)]
164164
mod tests {
165-
use std::fmt;
166-
use std::prelude::v1::*;
165+
use std::{fmt, prelude::v1::*};
167166

168167
use crate::core_arch::x86::*;
169168
use stdsimd_test::simd_test;

crates/core_arch/src/x86_64/cmpxchg16b.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ pub unsafe fn cmpxchg16b(
4949
success: Ordering,
5050
failure: Ordering,
5151
) -> u128 {
52-
use crate::intrinsics;
53-
use crate::sync::atomic::Ordering::*;
52+
use crate::{intrinsics, sync::atomic::Ordering::*};
5453

5554
debug_assert!(dst as usize % 16 == 0);
5655

crates/core_arch/src/x86_64/sse2.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@ pub unsafe fn _mm_cvtsi64x_sd(a: __m128d, b: i64) -> __m128d {
148148
#[cfg(test)]
149149
mod tests {
150150
use crate::core_arch::arch::x86_64::*;
151-
use std::boxed;
152-
use std::{f64, i64};
151+
use std::{boxed, f64, i64};
153152
use stdsimd_test::simd_test;
154153

155154
#[simd_test(enable = "sse2")]

crates/stdsimd-verify/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ extern crate syn;
77

88
use proc_macro::TokenStream;
99
use proc_macro2::Span;
10-
use std::fs::File;
11-
use std::io::Read;
12-
use std::path::Path;
10+
use std::{fs::File, io::Read, path::Path};
1311
use syn::ext::IdentExt;
1412

1513
#[proc_macro]

crates/stdsimd-verify/tests/arm.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#![allow(bad_style)]
22

3-
use std::collections::HashMap;
4-
use std::rc::Rc;
5-
6-
use html5ever::driver::ParseOpts;
7-
use html5ever::parse_document;
8-
use html5ever::rcdom::{Node, NodeData, RcDom};
9-
use html5ever::tendril::TendrilSink;
10-
use html5ever::tree_builder::TreeBuilderOpts;
3+
use std::{collections::HashMap, rc::Rc};
4+
5+
use html5ever::{
6+
driver::ParseOpts,
7+
parse_document,
8+
rcdom::{Node, NodeData, RcDom},
9+
tendril::TendrilSink,
10+
tree_builder::TreeBuilderOpts,
11+
};
1112

1213
struct Function {
1314
name: &'static str,

examples/hex.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ extern crate core_arch;
3535
#[macro_use]
3636
extern crate quickcheck;
3737

38-
use std::io::{self, Read};
39-
use std::str;
38+
use std::{
39+
io::{self, Read},
40+
str,
41+
};
4042

4143
#[cfg(target_arch = "x86")]
4244
use core_arch::x86::*;

0 commit comments

Comments
 (0)