mirror of
https://github.com/horizon-rust/horizon.git
synced 2026-11-07 11:06:11 -10:00
Merge pull request #11716 from horizon-rust/agent/cg70-one-rust-version
🤖 Agent: fixes main's red clippy since #11561 (1.95 lints on interpolation.rs: is_multiple_of on non-zero unsigned divisors, as_chunks_mut::<4> quads); workspace clippy clean on main + this.
This commit is contained in:
1 file changed
+13
-4
@@ -99,7 +99,7 @@ impl InterpolatedSampler {
|
||||
// Every cell has its own level of corners above it: none is clamped.
|
||||
let whole = (0..3).all(|i| {
|
||||
volume.minimum()[i].rem_euclid(self.cell_size[i]) == 0
|
||||
&& (i == 1 || sizes[i] % cell[i] == 0)
|
||||
&& (i == 1 || sizes[i].is_multiple_of(cell[i]))
|
||||
&& coarse.sizes()[i] == sizes[i].div_ceil(cell[i]) + 1
|
||||
});
|
||||
// Lanes run four Xs of one cell; each column stores four Ys at a time.
|
||||
@@ -141,8 +141,17 @@ impl InterpolatedSampler {
|
||||
// `low + increment * start[1]`, the cell starting at its Y 0.
|
||||
let mut value: [f32; 4] =
|
||||
std::array::from_fn(|lane| bottom[lane] + increment[lane] * 0.0);
|
||||
let quads = a.chunks_exact_mut(4).zip(b.chunks_exact_mut(4));
|
||||
let quads = quads.zip(c.chunks_exact_mut(4).zip(d.chunks_exact_mut(4)));
|
||||
let quads = a
|
||||
.as_chunks_mut::<4>()
|
||||
.0
|
||||
.iter_mut()
|
||||
.zip(b.as_chunks_mut::<4>().0);
|
||||
let quads = quads.zip(
|
||||
c.as_chunks_mut::<4>()
|
||||
.0
|
||||
.iter_mut()
|
||||
.zip(d.as_chunks_mut::<4>().0),
|
||||
);
|
||||
for ((a, b), (c, d)) in quads {
|
||||
let mut rows = [[0.0; 4]; 4];
|
||||
for row in &mut rows {
|
||||
@@ -405,7 +414,7 @@ mod tests {
|
||||
3e38,
|
||||
];
|
||||
const SCALE: [f32; 4] = [1.0, 1e-3, 1e30, 3e-39];
|
||||
if hash % 23 == 0 {
|
||||
if hash.is_multiple_of(23) {
|
||||
SPECIAL[(hash >> 5) as usize % 8]
|
||||
} else {
|
||||
((hash >> 8) as f32 / (1 << 24) as f32 - 0.5) * SCALE[(hash >> 3) as usize % 4]
|
||||
|
||||
Reference in new issue
Block a user