Skip to content

Commit edd0ef8

Browse files
Fix clippy::manual_repeat_n lints (#7394)
1 parent 1e172b2 commit edd0ef8

File tree

9 files changed

+14
-18
lines changed

9 files changed

+14
-18
lines changed

naga/src/arena/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,7 @@ where
271271
D: serde::Deserializer<'de>,
272272
{
273273
let data = Vec::deserialize(deserializer)?;
274-
let span_info = core::iter::repeat(Span::default())
275-
.take(data.len())
276-
.collect();
274+
let span_info = core::iter::repeat_n(Span::default(), data.len()).collect();
277275

278276
Ok(Self { data, span_info })
279277
}

naga/src/arena/unique_arena.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ where
224224
D: serde::Deserializer<'de>,
225225
{
226226
let set = FastIndexSet::deserialize(deserializer)?;
227-
let span_info = core::iter::repeat(Span::default())
228-
.take(set.len())
229-
.collect();
227+
let span_info = core::iter::repeat_n(Span::default(), set.len()).collect();
230228

231229
Ok(Self { set, span_info })
232230
}

naga/src/front/glsl/context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1258,7 +1258,7 @@ impl<'a> Context<'a> {
12581258
right = self.add_expression(
12591259
Expression::Compose {
12601260
ty,
1261-
components: core::iter::repeat(right).take(cols as usize).collect(),
1261+
components: core::iter::repeat_n(right, cols as usize).collect(),
12621262
},
12631263
meta,
12641264
)?;

naga/src/front/glsl/functions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ impl Frontend {
348348
}
349349
}
350350
_ => {
351-
components = iter::repeat(value).take(columns as usize).collect();
351+
components = iter::repeat_n(value, columns as usize).collect();
352352
}
353353
}
354354

naga/src/ir/block.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ impl Block {
2323
}
2424

2525
pub fn from_vec(body: Vec<Statement>) -> Self {
26-
let span_info = core::iter::repeat(Span::default())
27-
.take(body.len())
28-
.collect();
26+
let span_info = core::iter::repeat_n(Span::default(), body.len()).collect();
2927
Self { body, span_info }
3028
}
3129

naga/src/proc/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ pub fn flatten_compose<'arenas>(
590590
count = size as usize;
591591
}
592592
}
593-
core::iter::repeat(expr).take(count)
593+
core::iter::repeat_n(expr, count)
594594
}
595595

596596
// Expressions like `vec4(vec3(vec2(6, 7), 8), 9)` require us to

wgpu-core/src/command/compute.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ fn set_pipeline(
765765
{
766766
// Note that non-0 range start doesn't work anyway https://github.com/gfx-rs/wgpu/issues/4502
767767
let len = push_constant_range.len() / wgt::PUSH_CONSTANT_ALIGNMENT as usize;
768-
state.push_constants.extend(core::iter::repeat(0).take(len));
768+
state.push_constants.extend(core::iter::repeat_n(0, len));
769769
}
770770

771771
// Clear push constant ranges

wgpu-core/src/init_tracker/texture.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ pub(crate) struct TextureInitTracker {
5353
impl TextureInitTracker {
5454
pub(crate) fn new(mip_level_count: u32, depth_or_array_layers: u32) -> Self {
5555
TextureInitTracker {
56-
mips: core::iter::repeat(TextureLayerInitTracker::new(depth_or_array_layers))
57-
.take(mip_level_count as usize)
58-
.collect(),
56+
mips: core::iter::repeat_n(
57+
TextureLayerInitTracker::new(depth_or_array_layers),
58+
mip_level_count as usize,
59+
)
60+
.collect(),
5961
}
6062
}
6163

wgpu-core/src/pipeline_cache.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ mod tests {
483483
let cache = cache
484484
.into_iter()
485485
.flatten()
486-
.chain(core::iter::repeat(0u8).take(100))
486+
.chain(core::iter::repeat_n(0u8, 100))
487487
.collect::<Vec<u8>>();
488488
let validation_result = super::validate_pipeline_cache(&cache, &ADAPTER, VALIDATION_KEY);
489489
let expected: &[u8] = &[0; 100];
@@ -504,7 +504,7 @@ mod tests {
504504
let cache = cache
505505
.into_iter()
506506
.flatten()
507-
.chain(core::iter::repeat(0u8).take(200))
507+
.chain(core::iter::repeat_n(0u8, 200))
508508
.collect::<Vec<u8>>();
509509
let validation_result = super::validate_pipeline_cache(&cache, &ADAPTER, VALIDATION_KEY);
510510
assert_eq!(validation_result, Err(E::Extended));

0 commit comments

Comments
 (0)