From f234ff27ab756098cab7dbef82c87d21cc7cdce2 Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Wed, 26 Feb 2025 16:22:52 -0500 Subject: [PATCH] chore: satisfy `clippy::unnecessary_map_or` in Rust 1.85 --- naga/src/back/glsl/mod.rs | 3 +-- naga/src/back/hlsl/writer.rs | 4 ++-- naga/src/back/msl/writer.rs | 3 +-- naga/src/front/spv/function.rs | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/naga/src/back/glsl/mod.rs b/naga/src/back/glsl/mod.rs index 3458ca156..a9c32d704 100644 --- a/naga/src/back/glsl/mod.rs +++ b/naga/src/back/glsl/mod.rs @@ -2203,8 +2203,7 @@ impl<'a, W: Write> Writer<'a, W> { self.write_stmt(sta, ctx, l2.next())?; } - if !case.fall_through - && case.body.last().map_or(true, |s| !s.is_terminator()) + if !case.fall_through && case.body.last().is_none_or(|s| !s.is_terminator()) { writeln!(self.out, "{}break;", l2.next())?; } diff --git a/naga/src/back/hlsl/writer.rs b/naga/src/back/hlsl/writer.rs index 96e237013..55ffad2d8 100644 --- a/naga/src/back/hlsl/writer.rs +++ b/naga/src/back/hlsl/writer.rs @@ -1715,14 +1715,14 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> { } let last_case = &cases[end_case_idx]; - if last_case.body.last().map_or(true, |s| !s.is_terminator()) { + if last_case.body.last().is_none_or(|s| !s.is_terminator()) { writeln!(self.out, "{indent_level_2}break;")?; } } else { for sta in case.body.iter() { self.write_stmt(module, sta, func_ctx, indent_level_2)?; } - if !case.fall_through && case.body.last().map_or(true, |s| !s.is_terminator()) { + if !case.fall_through && case.body.last().is_none_or(|s| !s.is_terminator()) { writeln!(self.out, "{indent_level_2}break;")?; } } diff --git a/naga/src/back/msl/writer.rs b/naga/src/back/msl/writer.rs index bc77a7f6d..6fe3e9f0c 100644 --- a/naga/src/back/msl/writer.rs +++ b/naga/src/back/msl/writer.rs @@ -3223,8 +3223,7 @@ impl Writer { } self.put_block(lcase.next(), &case.body, context)?; - if !case.fall_through - && case.body.last().map_or(true, |s| !s.is_terminator()) + if !case.fall_through && case.body.last().is_none_or(|s| !s.is_terminator()) { writeln!(self.out, "{}break;", lcase.next())?; } diff --git a/naga/src/front/spv/function.rs b/naga/src/front/spv/function.rs index b780cbe77..8cf360df2 100644 --- a/naga/src/front/spv/function.rs +++ b/naga/src/front/spv/function.rs @@ -643,7 +643,7 @@ impl BlockContext<'_> { let body = lower_impl(blocks, bodies, body_idx); // Handle simple cases that would make a fallthrough statement unreachable code - let fall_through = body.last().map_or(true, |s| !s.is_terminator()); + let fall_through = body.last().is_none_or(|s| !s.is_terminator()); crate::SwitchCase { value: crate::SwitchValue::I32(value),