Skip to content

Commit 9f5dcf9

Browse files
committed
Fix new clippy::unnecessary_map_or warnings.
1 parent 8dff45e commit 9f5dcf9

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

crates/rustc_codegen_spirv/src/builder/builder_methods.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
618618

619619
if offset == Size::ZERO
620620
&& leaf_size_range.contains(&ty_size)
621-
&& leaf_ty.map_or(true, |leaf_ty| leaf_ty == ty)
621+
&& leaf_ty.is_none_or(|leaf_ty| leaf_ty == ty)
622622
{
623623
trace!("returning type: {:?}", self.debug_type(ty));
624624
trace!("returning indices with len: {:?}", indices.len());

crates/rustc_codegen_spirv/src/linker/import_export_link.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,9 @@ fn kill_linkage_instructions(
229229
.retain(|f| !rewrite_rules.contains_key(&f.def_id().unwrap()));
230230

231231
// drop imported variables
232-
module.types_global_values.retain(|v| {
233-
v.result_id
234-
.map_or(true, |v| !rewrite_rules.contains_key(&v))
235-
});
232+
module
233+
.types_global_values
234+
.retain(|v| v.result_id.is_none_or(|v| !rewrite_rules.contains_key(&v)));
236235

237236
// NOTE(eddyb) `Options`'s `keep_link_export`s field requests that `Export`s
238237
// are left in (primarily for unit testing - see also its doc comment).
@@ -264,21 +263,21 @@ fn import_kill_annotations_and_debug(
264263
) {
265264
module.annotations.retain(|inst| {
266265
inst.operands.is_empty()
267-
|| inst.operands[0].id_ref_any().map_or(true, |id| {
266+
|| inst.operands[0].id_ref_any().is_none_or(|id| {
268267
!rewrite_rules.contains_key(&id) && !killed_parameters.contains(&id)
269268
})
270269
});
271270
module.debug_names.retain(|inst| {
272271
inst.operands.is_empty()
273-
|| inst.operands[0].id_ref_any().map_or(true, |id| {
272+
|| inst.operands[0].id_ref_any().is_none_or(|id| {
274273
!rewrite_rules.contains_key(&id) && !killed_parameters.contains(&id)
275274
})
276275
});
277276
// need to remove OpGroupDecorate members that mention this id
278277
for inst in &mut module.annotations {
279278
if inst.class.opcode == Op::GroupDecorate {
280279
inst.operands.retain(|op| {
281-
op.id_ref_any().map_or(true, |id| {
280+
op.id_ref_any().is_none_or(|id| {
282281
!rewrite_rules.contains_key(&id) && !killed_parameters.contains(&id)
283282
})
284283
});

crates/rustc_codegen_spirv/src/linker/mem2reg.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ fn remove_old_variables(
598598
block.instructions.retain(|inst| {
599599
!matches!(inst.class.opcode, Op::AccessChain | Op::InBoundsAccessChain)
600600
|| inst.operands.iter().all(|op| {
601-
op.id_ref_any().map_or(true, |id| {
601+
op.id_ref_any().is_none_or(|id| {
602602
var_maps_and_types
603603
.iter()
604604
.all(|(var_map, _)| !var_map.contains_key(&id))

0 commit comments

Comments
 (0)