portal/waffle
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix clippy lints

Browse source
This commit is contained in:
Chris Fallin 2021-11-13 03:49:19 -08:00
parent f483b964bb
commit 94b180feb8
2 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/frontend.rs
View file

@ -10,7 +10,7 @@ use wasmparser::{
ImportSectionEntryType, Operator, Parser, Payload, Type, TypeDef, TypeOrFuncType, ImportSectionEntryType, Operator, Parser, Payload, Type, TypeDef, TypeOrFuncType,
}; };
pub fn wasm_to_ir<'a>(bytes: &'a [u8]) -> Result<Module<'a>> { pub fn wasm_to_ir(bytes: &[u8]) -> Result<Module<'_>> {
let mut module = Module::default(); let mut module = Module::default();
let parser = Parser::new(0); let parser = Parser::new(0);
let mut next_func = 0; let mut next_func = 0;
@ -32,22 +32,16 @@ fn handle_payload<'a>(
Payload::TypeSection(mut reader) => { Payload::TypeSection(mut reader) => {
for _ in 0..reader.get_count() { for _ in 0..reader.get_count() {
let ty = reader.read()?; let ty = reader.read()?;
match ty { if let TypeDef::Func(fty) = ty {
TypeDef::Func(fty) => { module.signatures.push(fty);
module.signatures.push(fty);
}
_ => {}
} }
} }
} }
Payload::ImportSection(mut reader) => { Payload::ImportSection(mut reader) => {
for _ in 0..reader.get_count() { for _ in 0..reader.get_count() {
match reader.read()?.ty { if let ImportSectionEntryType::Function(sig_idx) = reader.read()?.ty {
ImportSectionEntryType::Function(sig_idx) => { module.funcs.push(FuncDecl::Import(sig_idx as SignatureId));
module.funcs.push(FuncDecl::Import(sig_idx as SignatureId)); *next_func += 1;
*next_func += 1;
}
_ => {}
} }
} }
} }
@ -64,10 +58,10 @@ fn handle_payload<'a>(
*next_func += 1; *next_func += 1;
let my_sig = module.funcs[func_idx].sig(); let my_sig = module.funcs[func_idx].sig();
let body = parse_body(&module, my_sig, body)?; let body = parse_body(module, my_sig, body)?;
match &mut module.funcs[func_idx] { match &mut module.funcs[func_idx] {
&mut FuncDecl::Body(_, ref mut existing_body) => { FuncDecl::Body(_, ref mut existing_body) => {
*existing_body = body; *existing_body = body;
} }
_ => unreachable!(), _ => unreachable!(),
@ -93,7 +87,7 @@ fn parse_body<'a, 'b>(
} }
} }
let mut builder = FunctionBodyBuilder::new(&module, my_sig, &mut ret); let mut builder = FunctionBodyBuilder::new(module, my_sig, &mut ret);
let ops = body.get_operators_reader()?; let ops = body.get_operators_reader()?;
for op in ops.into_iter() { for op in ops.into_iter() {
let op = op?; let op = op?;

4
src/ir.rs
View file

@ -23,8 +23,8 @@ pub enum FuncDecl<'a> {
impl<'a> FuncDecl<'a> { impl<'a> FuncDecl<'a> {
pub fn sig(&self) -> SignatureId { pub fn sig(&self) -> SignatureId {
match self { match self {
&FuncDecl::Import(sig) => sig, FuncDecl::Import(sig) => *sig,
&FuncDecl::Body(sig, ..) => sig, FuncDecl::Body(sig, ..) => *sig,
} }
} }
} }