code002lover/Wasynth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Housekeeping with clippy

Browse Source
This commit is contained in:
Rerumu
2023-06-20 14:07:25 -04:00
parent 857737ff52
commit 7a49d61e0a
13 changed files with 96 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codegen/luajit/src/backend/expression.rs
+3 -4
View File
@@ -105,17 +105,16 @@ impl DriverNoContext for BinOp {
write!(w, "(")?;
self.lhs().write(w)?;
write!(w, " {symbol} ")?;
self.rhs().write(w)?;
write!(w, ")")
} else {
let (head, tail) = self.op_type().as_name();
write!(w, "{head}_{tail}(")?;
self.lhs().write(w)?;
write!(w, ", ")?;
self.rhs().write(w)?;
write!(w, ")")
}
self.rhs().write(w)?;
write!(w, ")")
}
}
codegen/luajit/src/backend/manager.rs
+1 -1
View File
@@ -65,7 +65,7 @@ impl Manager {
self.label_list.pop().unwrap();
}
pub fn indentation(&self) -> usize {
pub const fn indentation(&self) -> usize {
self.indentation
}
codegen/luajit/src/translator.rs
+10 -20
View File
@@ -25,11 +25,11 @@ trait AsIEName {
impl AsIEName for External {
fn as_ie_name(&self) -> &str {
match self {
External::Func => "func_list",
External::Table => "table_list",
External::Memory => "memory_list",
External::Global => "global_list",
External::Tag => unimplemented!(),
Self::Func => "func_list",
Self::Table => "table_list",
Self::Memory => "memory_list",
Self::Global => "global_list",
Self::Tag => unimplemented!(),
}
}
}
@@ -41,10 +41,7 @@ fn reader_to_code(reader: OperatorsReader) -> Vec<Operator> {
}
fn write_named_array(name: &str, len: usize, w: &mut dyn Write) -> Result<()> {
let len = match len.checked_sub(1) {
Some(len) => len,
None => return Ok(()),
};
let Some(len) = len.checked_sub(1) else { return Ok(()) };
writeln!(w, "local {name} = table_new({len}, 1)")
}
@@ -154,13 +151,7 @@ fn write_global_list(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) ->
fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
for element in list {
let (index, init) = match element.kind {
ElementKind::Active {
table_index,
offset_expr,
} => (table_index, offset_expr),
_ => unimplemented!(),
};
let ElementKind::Active { table_index: index, offset_expr: init } = element.kind else { unreachable!() };
writeln!(w, "\tdo")?;
writeln!(w, "\t\tlocal target = TABLE_LIST[{index}].data")?;
@@ -264,10 +255,9 @@ fn write_localize_used(func_list: &[FuncData], w: &mut dyn Write) -> Result<BTre
fn write_func_start(wasm: &Module, index: u32, w: &mut dyn Write) -> Result<()> {
write!(w, "FUNC_LIST[{index}] = ")?;
match wasm.name_section().get(&index) {
Some(name) => write!(w, "--[[ {name} ]] "),
None => Ok(()),
}
wasm.name_section()
.get(&index)
.map_or_else(|| Ok(()), |name| write!(w, "--[[ {name} ]] "))
}
fn write_func_list(wasm: &Module, func_list: &[FuncData], w: &mut dyn Write) -> Result<()> {
codegen/luau/src/backend/expression.rs
+3 -4
View File
@@ -125,17 +125,16 @@ impl DriverNoContext for BinOp {
write!(w, "(")?;
self.lhs().write(w)?;
write!(w, " {symbol} ")?;
self.rhs().write(w)?;
write!(w, ")")
} else {
let (head, tail) = self.op_type().as_name();
write!(w, "{head}_{tail}(")?;
self.lhs().write(w)?;
write!(w, ", ")?;
self.rhs().write(w)?;
write!(w, ")")
}
self.rhs().write(w)?;
write!(w, ")")
}
}
codegen/luau/src/backend/manager.rs
+1 -1
View File
@@ -61,7 +61,7 @@ impl Manager {
self.label_list.pop().unwrap();
}
pub fn indentation(&self) -> usize {
pub const fn indentation(&self) -> usize {
self.indentation
}
codegen/luau/src/backend/statement.rs
+1 -1
View File
@@ -27,7 +27,7 @@ impl Driver for Br {
}
if self.target() == 0 {
if let Some(Some(LabelType::Backward)) = mng.label_list().last() {
if mng.label_list().last() == Some(&Some(LabelType::Backward)) {
line!(mng, w, "continue")
} else {
line!(mng, w, "break")
codegen/luau/src/translator.rs
+10 -20
View File
@@ -25,11 +25,11 @@ trait AsIEName {
impl AsIEName for External {
fn as_ie_name(&self) -> &str {
match self {
External::Func => "func_list",
External::Table => "table_list",
External::Memory => "memory_list",
External::Global => "global_list",
External::Tag => unimplemented!(),
Self::Func => "func_list",
Self::Table => "table_list",
Self::Memory => "memory_list",
Self::Global => "global_list",
Self::Tag => unimplemented!(),
}
}
}
@@ -41,10 +41,7 @@ fn reader_to_code(reader: OperatorsReader) -> Vec<Operator> {
}
fn write_named_array(name: &str, len: usize, w: &mut dyn Write) -> Result<()> {
let len = match len.checked_sub(1) {
Some(len) => len,
None => return Ok(()),
};
let Some(len) = len.checked_sub(1) else { return Ok(()) };
writeln!(w, "local {name} = table.create({len})")
}
@@ -154,13 +151,7 @@ fn write_global_list(wasm: &Module, type_info: &TypeInfo, w: &mut dyn Write) ->
fn write_element_list(list: &[Element], type_info: &TypeInfo, w: &mut dyn Write) -> Result<()> {
for element in list {
let (index, init) = match element.kind {
ElementKind::Active {
table_index,
offset_expr,
} => (table_index, offset_expr),
_ => unimplemented!(),
};
let ElementKind::Active { table_index: index, offset_expr: init } = element.kind else { unreachable!() };
writeln!(w, "\tdo")?;
writeln!(w, "\t\tlocal target = TABLE_LIST[{index}].data")?;
@@ -277,10 +268,9 @@ fn write_localize_used(
fn write_func_start(wasm: &Module, index: u32, w: &mut dyn Write) -> Result<()> {
write!(w, "FUNC_LIST[{index}] = ")?;
match wasm.name_section().get(&index) {
Some(name) => write!(w, "--[[ {name} ]] "),
None => Ok(()),
}
wasm.name_section()
.get(&index)
.map_or_else(|| Ok(()), |name| write!(w, "--[[ {name} ]] "))
}
fn write_func_list(wasm: &Module, func_list: &[FuncData], w: &mut dyn Write) -> Result<()> {