Skip to content

Commit

Permalink
Use Option::as_deref as appropriate.
Browse files Browse the repository at this point in the history
  • Loading branch information
jimblandy committed Sep 1, 2022
1 parent b63436a commit c4954b1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/back/spv/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ impl Writer {
ShaderStage::Fragment => true,
};
let id = if let Some(ref binding) = argument.binding {
let name = argument.name.as_ref().map(AsRef::as_ref);
let name = argument.name.as_deref();

let varying_id = self.write_varying(
ir_module,
Expand All @@ -369,7 +369,7 @@ impl Writer {
let mut constituent_ids = Vec::with_capacity(members.len());
for member in members {
let type_id = self.get_type_id(LookupType::Handle(member.ty));
let name = member.name.as_ref().map(AsRef::as_ref);
let name = member.name.as_deref();
let binding = member.binding.as_ref().unwrap();
let varying_id = self.write_varying(
ir_module,
Expand Down Expand Up @@ -456,7 +456,7 @@ impl Writer {
{
for member in members {
let type_id = self.get_type_id(LookupType::Handle(member.ty));
let name = member.name.as_ref().map(AsRef::as_ref);
let name = member.name.as_deref();
let binding = member.binding.as_ref().unwrap();
has_point_size |=
*binding == crate::Binding::BuiltIn(crate::BuiltIn::PointSize);
Expand Down

0 comments on commit c4954b1

Please sign in to comment.