Skip to content

Commit 752cb33

Browse files
committed
style(simd_nightly): apply cargo fmt --all (PR #146 fmt fix)
The round-3-portable-simd fleet wrote agent files without running cargo fmt, so the format/stable CI job (now blocking per PR #145) flagged 34 drift sites across 12 files in src/simd_nightly/. `cargo fmt --all` normalizes. Zero semantic changes. Verified: `cargo fmt --all --check` clean.
1 parent bd191f4 commit 752cb33

12 files changed

Lines changed: 51 additions & 71 deletions

File tree

src/simd_nightly/bf16_types.rs

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ impl BF16x16 {
4848
/// Load 16 BF16 bit-patterns from a `u16` slice (must have `len >= 16`).
4949
#[inline]
5050
pub fn from_slice(s: &[u16]) -> Self {
51-
assert!(
52-
s.len() >= 16,
53-
"BF16x16::from_slice: need >= 16 elements, got {}",
54-
s.len()
55-
);
51+
assert!(s.len() >= 16, "BF16x16::from_slice: need >= 16 elements, got {}", s.len());
5652
let mut arr = [0u16; 16];
5753
arr.copy_from_slice(&s[..16]);
5854
Self(arr)
@@ -73,11 +69,7 @@ impl BF16x16 {
7369
/// Write the 16 BF16 bit-patterns into `dst` (must have `len >= 16`).
7470
#[inline]
7571
pub fn copy_to_slice(self, dst: &mut [u16]) {
76-
assert!(
77-
dst.len() >= 16,
78-
"BF16x16::copy_to_slice: need >= 16 elements, got {}",
79-
dst.len()
80-
);
72+
assert!(dst.len() >= 16, "BF16x16::copy_to_slice: need >= 16 elements, got {}", dst.len());
8173
dst[..16].copy_from_slice(&self.0);
8274
}
8375

@@ -119,11 +111,7 @@ impl BF16x8 {
119111
/// Load 8 BF16 bit-patterns from a `u16` slice (must have `len >= 8`).
120112
#[inline]
121113
pub fn from_slice(s: &[u16]) -> Self {
122-
assert!(
123-
s.len() >= 8,
124-
"BF16x8::from_slice: need >= 8 elements, got {}",
125-
s.len()
126-
);
114+
assert!(s.len() >= 8, "BF16x8::from_slice: need >= 8 elements, got {}", s.len());
127115
let mut arr = [0u16; 8];
128116
arr.copy_from_slice(&s[..8]);
129117
Self(arr)
@@ -144,11 +132,7 @@ impl BF16x8 {
144132
/// Write the 8 BF16 bit-patterns into `dst` (must have `len >= 8`).
145133
#[inline]
146134
pub fn copy_to_slice(self, dst: &mut [u16]) {
147-
assert!(
148-
dst.len() >= 8,
149-
"BF16x8::copy_to_slice: need >= 8 elements, got {}",
150-
dst.len()
151-
);
135+
assert!(dst.len() >= 8, "BF16x8::copy_to_slice: need >= 8 elements, got {}", dst.len());
152136
dst[..8].copy_from_slice(&self.0);
153137
}
154138

src/simd_nightly/exotic_methods.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl U8x64 {
138138
for lane in 0..4 {
139139
let base = lane * 16;
140140
for i in 0..8 {
141-
out[base + i * 2] = a[base + i];
141+
out[base + i * 2] = a[base + i];
142142
out[base + i * 2 + 1] = b[base + i];
143143
}
144144
}
@@ -172,7 +172,7 @@ impl U8x64 {
172172
for lane in 0..4 {
173173
let base = lane * 16;
174174
for i in 0..8 {
175-
out[base + i * 2] = a[base + 8 + i];
175+
out[base + i * 2] = a[base + 8 + i];
176176
out[base + i * 2 + 1] = b[base + 8 + i];
177177
}
178178
}
@@ -310,7 +310,7 @@ impl U8x32 {
310310
for lane in 0..2 {
311311
let base = lane * 16;
312312
for i in 0..8 {
313-
out[base + i * 2] = a[base + i];
313+
out[base + i * 2] = a[base + i];
314314
out[base + i * 2 + 1] = b[base + i];
315315
}
316316
}
@@ -344,7 +344,7 @@ impl U8x32 {
344344
for lane in 0..2 {
345345
let base = lane * 16;
346346
for i in 0..8 {
347-
out[base + i * 2] = a[base + 8 + i];
347+
out[base + i * 2] = a[base + 8 + i];
348348
out[base + i * 2 + 1] = b[base + 8 + i];
349349
}
350350
}
@@ -436,7 +436,7 @@ mod tests {
436436
for lane in 0..4 {
437437
let base = lane * 16;
438438
for i in 0..8 {
439-
assert_eq!(arr[base + i * 2], 0xAA, "lane {lane} pos {}", i * 2);
439+
assert_eq!(arr[base + i * 2], 0xAA, "lane {lane} pos {}", i * 2);
440440
assert_eq!(arr[base + i * 2 + 1], 0xBB, "lane {lane} pos {}", i * 2 + 1);
441441
}
442442
}
@@ -459,7 +459,7 @@ mod tests {
459459
for lane in 0..4 {
460460
let base = lane * 16;
461461
for i in 0..8 {
462-
assert_eq!(arr[base + i * 2], (8 + i) as u8, "lane {lane} a[{i}]");
462+
assert_eq!(arr[base + i * 2], (8 + i) as u8, "lane {lane} a[{i}]");
463463
assert_eq!(arr[base + i * 2 + 1], (108 + i) as u8, "lane {lane} b[{i}]");
464464
}
465465
}
@@ -533,7 +533,7 @@ mod tests {
533533
for lane in 0..2 {
534534
let base = lane * 16;
535535
for i in 0..8 {
536-
assert_eq!(arr[base + i * 2], 0xAA);
536+
assert_eq!(arr[base + i * 2], 0xAA);
537537
assert_eq!(arr[base + i * 2 + 1], 0xBB);
538538
}
539539
}
@@ -556,7 +556,7 @@ mod tests {
556556
for lane in 0..2 {
557557
let base = lane * 16;
558558
for i in 0..8 {
559-
assert_eq!(arr[base + i * 2], (8 + i) as u8, "lane {lane} a[{i}]");
559+
assert_eq!(arr[base + i * 2], (8 + i) as u8, "lane {lane} a[{i}]");
560560
assert_eq!(arr[base + i * 2 + 1], (108 + i) as u8, "lane {lane} b[{i}]");
561561
}
562562
}

src/simd_nightly/f16_types.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,7 @@ mod tests {
228228
let v = F16x16::from_f32_array(inputs);
229229
let out = v.to_f32_array();
230230
for (i, (&orig, &back)) in inputs.iter().zip(out.iter()).enumerate() {
231-
assert!(
232-
(orig - back).abs() < 0.001,
233-
"lane {i}: {orig} → f16 → {back}"
234-
);
231+
assert!((orig - back).abs() < 0.001, "lane {i}: {orig} → f16 → {back}");
235232
}
236233
}
237234

src/simd_nightly/f32_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! F32x16 / F32x8 portable-simd wrappers — round-3-portable-simd agent #1.
22
#![cfg(feature = "nightly-simd")]
33

4-
use core::simd::{f32x16 as core_f32x16, f32x8 as core_f32x8};
54
use core::simd::cmp::{SimdPartialEq, SimdPartialOrd};
65
use core::simd::num::SimdFloat;
6+
use core::simd::{f32x16 as core_f32x16, f32x8 as core_f32x8};
77
// `mul_add`, `sqrt`, `round`, `floor`, `abs` live in `StdFloat` (std-only nightly trait).
88
use std::simd::StdFloat;
99

src/simd_nightly/f64_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! F64x8 / F64x4 portable-simd wrappers — round-3-portable-simd agent #2.
22
#![cfg(feature = "nightly-simd")]
33

4-
use core::simd::{f64x8 as core_f64x8, f64x4 as core_f64x4};
54
use core::simd::cmp::{SimdPartialEq, SimdPartialOrd};
65
use core::simd::num::SimdFloat;
6+
use core::simd::{f64x4 as core_f64x4, f64x8 as core_f64x8};
77
use std::simd::StdFloat;
88

99
// ════════════════════════════════════════════════════════════════════

src/simd_nightly/i8_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! I8x32 / I8x64 portable-simd wrappers — round-3-portable-simd agent #5.
22
#![cfg(feature = "nightly-simd")]
33

4-
use core::simd::{i8x32, i8x64};
54
use core::simd::cmp::{SimdOrd, SimdPartialEq, SimdPartialOrd};
65
use core::simd::num::SimdInt;
6+
use core::simd::{i8x32, i8x64};
77

88
// ════════════════════════════════════════════════════════════════════
99
// I8x64 — 64-lane signed byte

src/simd_nightly/i_word_types.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! I16x16 / I16x32 / I32x16 / I64x8 portable-simd wrappers — round-3-portable-simd agent #6.
22
#![cfg(feature = "nightly-simd")]
33

4-
use core::simd::{i16x16, i16x32, i32x16, i64x8};
54
use core::simd::cmp::{SimdOrd, SimdPartialEq, SimdPartialOrd};
65
use core::simd::num::SimdInt;
6+
use core::simd::{i16x16, i16x32, i32x16, i64x8};
77

88
// ════════════════════════════════════════════════════════════════════
99
// I16x16 — 16-lane signed 16-bit integer

src/simd_nightly/masks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
//! Comparison-result mask wrappers — round-3-portable-simd agent #7.
22
#![cfg(feature = "nightly-simd")]
33

4-
use core::simd::Mask;
4+
use super::{F32x16, F32x8, F64x4, F64x8};
55
use core::simd::prelude::Select;
6-
use super::{F32x16, F32x8, F64x8, F64x4};
6+
use core::simd::Mask;
77

88
// ============================================================================
99
// F32Mask16 — 16-lane mask for F32x16 comparisons

src/simd_nightly/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ pub use f32_types::{F32x16, F32x8};
4040
pub use f64_types::{F64x4, F64x8};
4141
pub use i8_types::{I8x32, I8x64};
4242
pub use i_word_types::{I16x16, I16x32, I32x16, I64x8};
43-
pub use masks::{F32Mask16, F32Mask8, F64Mask8, F64Mask4};
43+
pub use masks::{F32Mask16, F32Mask8, F64Mask4, F64Mask8};
4444
pub use u8_types::{U8x32, U8x64};
45-
pub use u_word_types::{U16x32, U32x8, U32x16, U64x4, U64x8};
45+
pub use u_word_types::{U16x32, U32x16, U32x8, U64x4, U64x8};

src/simd_nightly/tests.rs

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ fn f64x4_reduce_sum_parity() {
170170
fn f32x16_cmpeq_mask_parity() {
171171
let a: [f32; 16] = core::array::from_fn(|i| (i % 4) as f32);
172172
let b: [f32; 16] = core::array::from_fn(|i| (i % 2) as f32);
173-
let mask = F32x16::from_array(a).simd_eq(F32x16::from_array(b)).to_bitmask();
173+
let mask = F32x16::from_array(a)
174+
.simd_eq(F32x16::from_array(b))
175+
.to_bitmask();
174176
let mut expected: u16 = 0;
175177
for i in 0..16 {
176178
if a[i] == b[i] {
@@ -198,7 +200,9 @@ fn f32x16_cmpgt_mask_parity() {
198200
fn f32x8_cmpeq_mask_parity() {
199201
let a: [f32; 8] = core::array::from_fn(|i| (i % 2) as f32);
200202
let b: [f32; 8] = [0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0];
201-
let mask = F32x8::from_array(a).simd_eq(F32x8::from_array(b)).to_bitmask();
203+
let mask = F32x8::from_array(a)
204+
.simd_eq(F32x8::from_array(b))
205+
.to_bitmask();
202206
let mut expected: u8 = 0;
203207
for i in 0..8 {
204208
if a[i] == b[i] {
@@ -212,7 +216,9 @@ fn f32x8_cmpeq_mask_parity() {
212216
fn f64x8_cmpeq_mask_parity() {
213217
let a: [f64; 8] = core::array::from_fn(|i| (i % 3) as f64);
214218
let b: [f64; 8] = core::array::from_fn(|i| (i % 2) as f64);
215-
let mask = F64x8::from_array(a).simd_eq(F64x8::from_array(b)).to_bitmask();
219+
let mask = F64x8::from_array(a)
220+
.simd_eq(F64x8::from_array(b))
221+
.to_bitmask();
216222
let mut expected: u8 = 0;
217223
for i in 0..8 {
218224
if a[i] == b[i] {
@@ -359,7 +365,9 @@ fn f32x16_fma_scalar_parity() {
359365
let b: [f32; 16] = core::array::from_fn(|i| (i as f32) * 0.3);
360366
let c: [f32; 16] = core::array::from_fn(|i| i as f32);
361367
let simd_result = F32x16::from_array(a).mul_add(F32x16::from_array(b), F32x16::from_array(c));
362-
for (i, (&r, (&ai, (&bi, &ci)))) in simd_result.to_array().iter()
368+
for (i, (&r, (&ai, (&bi, &ci)))) in simd_result
369+
.to_array()
370+
.iter()
363371
.zip(a.iter().zip(b.iter().zip(c.iter())))
364372
.enumerate()
365373
{
@@ -381,10 +389,7 @@ fn bf16x16_from_f32_to_f32_lossy_within_bounds() {
381389
for (i, (&orig, &back)) in inputs.iter().zip(out.iter()).enumerate() {
382390
// BF16 truncation error is at most |orig| * 2^-7
383391
let max_err = orig.abs() * (2.0_f32.powi(-7)) + f32::EPSILON;
384-
assert!(
385-
(orig - back).abs() <= max_err,
386-
"lane {i}: orig={orig} back={back} err={}", (orig - back).abs()
387-
);
392+
assert!((orig - back).abs() <= max_err, "lane {i}: orig={orig} back={back} err={}", (orig - back).abs());
388393
}
389394
}
390395

@@ -395,10 +400,7 @@ fn bf16x8_from_f32_to_f32_lossy_within_bounds() {
395400
let out = v.to_f32_lossy();
396401
for (i, (&orig, &back)) in inputs.iter().zip(out.iter()).enumerate() {
397402
let max_err = orig.abs() * (2.0_f32.powi(-7)) + f32::EPSILON;
398-
assert!(
399-
(orig - back).abs() <= max_err,
400-
"lane {i}: orig={orig} back={back}"
401-
);
403+
assert!((orig - back).abs() <= max_err, "lane {i}: orig={orig} back={back}");
402404
}
403405
}
404406

@@ -425,10 +427,7 @@ fn f16x16_from_f32_to_f32_roundtrip_within_1ulp() {
425427
let out = v.to_f32_array();
426428
for (i, (&orig, &back)) in inputs.iter().zip(out.iter()).enumerate() {
427429
// These integers are exactly representable in f16 (range 0..2048)
428-
assert!(
429-
(orig - back).abs() <= 0.5,
430-
"lane {i}: orig={orig} back={back}"
431-
);
430+
assert!((orig - back).abs() <= 0.5, "lane {i}: orig={orig} back={back}");
432431
}
433432
}
434433

@@ -483,7 +482,9 @@ fn f32mask16_select_scalar_parity() {
483482
let threshold = F32x16::splat(7.5);
484483
let va = F32x16::from_array(a);
485484
let mask = va.simd_lt(threshold);
486-
let result = mask.select(F32x16::splat(100.0), F32x16::splat(200.0)).to_array();
485+
let result = mask
486+
.select(F32x16::splat(100.0), F32x16::splat(200.0))
487+
.to_array();
487488
for i in 0..16 {
488489
let expected = if a[i] < 7.5 { 100.0_f32 } else { 200.0_f32 };
489490
assert_eq!(result[i], expected, "lane {i}");
@@ -496,7 +497,9 @@ fn f32mask8_select_scalar_parity() {
496497
let threshold = F32x8::splat(3.5);
497498
let va = F32x8::from_array(a);
498499
let mask = va.simd_gt(threshold);
499-
let result = mask.select(F32x8::splat(10.0), F32x8::splat(20.0)).to_array();
500+
let result = mask
501+
.select(F32x8::splat(10.0), F32x8::splat(20.0))
502+
.to_array();
500503
for i in 0..8 {
501504
let expected = if a[i] > 3.5 { 10.0_f32 } else { 20.0_f32 };
502505
assert_eq!(result[i], expected, "lane {i}");
@@ -522,7 +525,9 @@ fn f64mask4_select_scalar_parity() {
522525
let threshold = F64x4::splat(4.0);
523526
let va = F64x4::from_array(a);
524527
let mask = va.simd_gt(threshold);
525-
let result = mask.select(F64x4::splat(99.0), F64x4::splat(0.0)).to_array();
528+
let result = mask
529+
.select(F64x4::splat(99.0), F64x4::splat(0.0))
530+
.to_array();
526531
// Lanes 1 (5>4) and 3 (7>4) should be 99.0
527532
assert_eq!(result, [0.0, 99.0, 0.0, 99.0]);
528533
}
@@ -682,10 +687,7 @@ fn f32x16_floor_parity() {
682687

683688
#[test]
684689
fn f32x16_round_parity() {
685-
let src: [f32; 16] = [
686-
0.5, 1.5, 2.5, 3.5, 4.5, 5.5, -0.5, -1.5,
687-
0.4, 1.6, 2.3, 3.7, -0.4, -1.6, 100.0, -100.0,
688-
];
690+
let src: [f32; 16] = [0.5, 1.5, 2.5, 3.5, 4.5, 5.5, -0.5, -1.5, 0.4, 1.6, 2.3, 3.7, -0.4, -1.6, 100.0, -100.0];
689691
let result = F32x16::from_array(src).round().to_array();
690692
for (i, (&r, &s)) in result.iter().zip(src.iter()).enumerate() {
691693
assert_eq!(r, s.round(), "lane {i}");

0 commit comments

Comments
 (0)