From 997c7a136786e843a0669a121bcf0ff3cde5a3d7 Mon Sep 17 00:00:00 2001 From: Muhammad Nauman Raza Date: Sun, 26 Jan 2025 09:37:59 +0000 Subject: [PATCH] refactor: various improvements utilising clippy --- src/main.rs | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main.rs b/src/main.rs index 4ebb377..84d2147 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,9 +4,9 @@ use std::io::{self, BufRead, BufReader}; fn retrieve(memory: &mut HashMap, ops: Vec) -> i64 { if ops.len() >= 3 { - return *memory.get(&ops[2]).unwrap_or(&0); + *memory.get(&ops[2]).unwrap_or(&0) } else { - return *memory.get(&ops[1]).unwrap_or(&0); + *memory.get(&ops[1]).unwrap_or(&0) } } @@ -17,14 +17,13 @@ fn process( labels: &HashMap, pc: &mut usize, ) -> usize { - let ops: Vec = line.trim().split_whitespace().map(String::from).collect(); + let ops: Vec = line.split_whitespace().map(String::from).collect(); - let options: Vec<&str>; - if ops.len() >= 3 { - options = vec![ops[0].as_str(), ops[1].as_str()]; + let options: Vec<&str> = if ops.len() >= 3 { + vec![ops[0].as_str(), ops[1].as_str()] } else { - options = vec![ops[0].as_str()]; - } + vec![ops[0].as_str()] + }; for op in options { match op { @@ -77,7 +76,7 @@ fn process( } } - return 0; + 0 } fn main() -> io::Result<()> { @@ -93,7 +92,7 @@ fn main() -> io::Result<()> { if line.trim().is_empty() { continue; } - let ops: Vec = line.trim().split_whitespace().map(String::from).collect(); + let ops: Vec = line.split_whitespace().map(String::from).collect(); if ops.len() > 1 && ops[1] == "DAT" { labels.insert(ops[0].clone(), index); } else if ops.len() > 1 {