From e43db8e7f486a1e34d17307e86baa82981ff8914 Mon Sep 17 00:00:00 2001 From: Garrit Franke Date: Sun, 21 Feb 2021 22:35:15 +0100 Subject: [PATCH] chore: fix clippy warnings --- src/builder/mod.rs | 4 ++-- src/generator/x86.rs | 4 ++-- src/main.rs | 1 - src/table/mod.rs | 20 -------------------- 4 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 src/table/mod.rs diff --git a/src/builder/mod.rs b/src/builder/mod.rs index 871a16c..26d0c25 100644 --- a/src/builder/mod.rs +++ b/src/builder/mod.rs @@ -65,13 +65,13 @@ impl Builder { // TODO: We shouldn't clone here let mut condensed = mod_iter.next().ok_or("No module specified")?.clone(); - while let Some(module) = mod_iter.next() { + for module in mod_iter { condensed.merge_with(module.clone()); } let output = generator::generate(condensed); let mut file = std::fs::File::create(out_file).expect("create failed"); file.write_all(output.as_bytes()).expect("write failed"); - Ok(file.flush().expect("Could not flush file")) + file.flush().map_err(|_| "Could not flush file".into()) } } diff --git a/src/generator/x86.rs b/src/generator/x86.rs index 6805456..ff91a10 100644 --- a/src/generator/x86.rs +++ b/src/generator/x86.rs @@ -61,8 +61,8 @@ impl X86Generator { func, globals, structs: _, - path, - imports, + path: _, + imports: _, } = prog; asm.add(".intel_syntax noprefix"); diff --git a/src/main.rs b/src/main.rs index b9d5f78..70d5278 100644 --- a/src/main.rs +++ b/src/main.rs @@ -27,7 +27,6 @@ mod command; mod generator; mod lexer; mod parser; -mod table; #[cfg(test)] mod tests; mod util; diff --git a/src/table/mod.rs b/src/table/mod.rs deleted file mode 100644 index e12df63..0000000 --- a/src/table/mod.rs +++ /dev/null @@ -1,20 +0,0 @@ -use std::collections::HashMap; -use crate::parser::node_type::Function; -use crate::parser::node_type::Type; - -pub struct Table { - types: Vec, - functions: HashMap, - modules: Vec, -} - -impl Table { - pub(crate) fn new() -> Self { - Self { - types: Vec::new(), - functions: HashMap::new(), - modules: Vec::new() - } - } -} -