From b67795cdfb956575bc1aab5b002e163ff98865d1 Mon Sep 17 00:00:00 2001 From: itycodes Date: Mon, 10 Mar 2025 06:43:14 +0100 Subject: [PATCH] Forgotten cargo fmt + R-A warning cleanup --- src/compiler/backend/mod.rs | 18 ++++++++++++------ src/compiler/backend/tests.rs | 7 +------ src/compiler/mod.rs | 3 +-- src/compiler/tests.rs | 1 - 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/compiler/backend/mod.rs b/src/compiler/backend/mod.rs index 5748cc0..598914c 100644 --- a/src/compiler/backend/mod.rs +++ b/src/compiler/backend/mod.rs @@ -333,10 +333,10 @@ fn match_number(s: &str) -> Number { pub fn compile_ast_ssa( ast: Ast, vars: &mut Vec<(String, String)>, - mut constants: &mut Vec<(String, String)>, - mut counter: &mut Box, - mut stack: &mut Vec, - mut out: &mut Vec<(Option, String)>, + constants: &mut Vec<(String, String)>, + counter: &mut Box, + stack: &mut Vec, + out: &mut Vec<(Option, String)>, ) { match ast.clone().list() { Some(l) => { @@ -356,10 +356,16 @@ pub fn compile_ast_ssa( compile_ast_ssa(val, vars, constants, counter, stack, out); let val_id = stack.pop().unwrap(); let ptr_id = stack.pop().unwrap(); - out.push((None, format!("OpStore {} {}", fix_name(&val_id), fix_name(&ptr_id)))); + out.push(( + None, + format!("OpStore {} {}", fix_name(&val_id), fix_name(&ptr_id)), + )); } s => { - panic!("Unknown function: {} with params {:#?} in context:\n{:#?}", s, lst, ast); + panic!( + "Unknown function: {} with params {:#?} in context:\n{:#?}", + s, lst, ast + ); } } } diff --git a/src/compiler/backend/tests.rs b/src/compiler/backend/tests.rs index 62ff63e..15164f9 100644 --- a/src/compiler/backend/tests.rs +++ b/src/compiler/backend/tests.rs @@ -68,12 +68,7 @@ fn test_block_ssa() { let mut module = meta_compile(ast.unwrap()).unwrap(); let fun = module.functions.pop().unwrap(); let block = fun.ast.unwrap(); - let block = block - .list() - .unwrap() - .get(0) - .unwrap() - .clone(); + let block = block.list().unwrap().get(0).unwrap().clone(); println!("{:#?}", block); let mut vars = vec![]; let mut constants = vec![]; diff --git a/src/compiler/mod.rs b/src/compiler/mod.rs index 4bf12ee..0238826 100644 --- a/src/compiler/mod.rs +++ b/src/compiler/mod.rs @@ -7,7 +7,7 @@ use crate::parser::{Ast, Localised, Location}; pub mod backend; mod meta_compile; -use std::{fmt, ops::Add, ptr}; +use std::fmt; #[cfg(test)] mod tests; @@ -240,4 +240,3 @@ pub fn meta_compile(ast: Ast) -> Result { } Ok(module) } - diff --git a/src/compiler/tests.rs b/src/compiler/tests.rs index 7a835a1..8064ea8 100644 --- a/src/compiler/tests.rs +++ b/src/compiler/tests.rs @@ -291,4 +291,3 @@ fn expected_type() { panic!() }; } -