Skip to content

Commit 53d8e68

Browse files
committed
Drop untriggered allows for unreachable_patterns
We fixed a new trigger for `clippy::match_overlapping_arm` in commit aa260e0 instead, which seemed to supersede this lint error.
1 parent ce7e66e commit 53d8e68

File tree

5 files changed

+2
-11
lines changed

5 files changed

+2
-11
lines changed

autogen/src/binary.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ fn gen_operand_param_parse_methods(grammar: &[structs::OperandKind]) -> Vec<(&st
152152
// For each operand kind in the BitEnum category, its
153153
// enumerants are bit masks. If a certain bit having associated
154154
// parameters is set, we also need to decode the corresponding
155-
// parameters. E.g., for MemoryAccess Aigned, an additional
155+
// parameters. E.g., for MemoryAccess Aligned, an additional
156156
// LiteralInteger, which stands for the known alignment, should
157157
// be decoded.
158158

@@ -191,10 +191,7 @@ fn gen_operand_param_parse_methods(grammar: &[structs::OperandKind]) -> Vec<(&st
191191
spirv::#kind::#symbol => vec![#(#params),*]
192192
}
193193
});
194-
// TODO: filter duplicated symbols mapping to the same discriminator to avoid
195-
// unreachable patterns.
196194
quote! {
197-
#[allow(unreachable_patterns)]
198195
fn #function_name(&mut self, #lo_kind: spirv::#kind) -> Result<Vec<dr::Operand>> {
199196
Ok(match #lo_kind {
200197
#(#cases),*,

autogen/src/sr.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -533,9 +533,6 @@ pub fn gen_sr_code_from_instruction_grammar(
533533
.map(ops::Terminator::Branch)
534534
}
535535
}
536-
// TODO: filter duplicated symbols mapping to the same discriminator to avoid
537-
// unreachable patterns.
538-
#[allow(unreachable_patterns)]
539536
pub fn lift_op(
540537
&mut self, raw: &dr::Instruction
541538
) -> Result<ops::Op, InstructionError> {

rspirv/binary/autogen_parse_operand.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@ impl Parser<'_, '_> {
322322
}
323323
Ok(params)
324324
}
325-
#[allow(unreachable_patterns)]
326325
fn parse_execution_mode_arguments(
327326
&mut self,
328327
execution_mode: spirv::ExecutionMode,
@@ -459,7 +458,6 @@ impl Parser<'_, '_> {
459458
_ => vec![],
460459
})
461460
}
462-
#[allow(unreachable_patterns)]
463461
fn parse_decoration_arguments(
464462
&mut self,
465463
decoration: spirv::Decoration,

rspirv/lift/autogen_context.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ impl LiftContext {
203203
_ => self.lift_branch(raw).map(ops::Terminator::Branch),
204204
}
205205
}
206-
#[allow(unreachable_patterns)]
207206
pub fn lift_op(&mut self, raw: &dr::Instruction) -> Result<ops::Op, InstructionError> {
208207
let mut operands = raw.operands.iter();
209208
match raw.class.opcode as u32 {

rspirv/lift/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl From<OperandError> for InstructionError {
6464
}
6565
}
6666

67-
/// Error that may occur during the convesion from the data representation
67+
/// Error that may occur during the conversion from the data representation
6868
/// of a module into a structured representation.
6969
#[derive(Clone, Debug)]
7070
pub enum ConversionError {

0 commit comments

Comments
 (0)