Merge pull request #84 from corewa-rs/clippy-format-in-format

corewa-rs · Apr 15, 2022 · 9e7303c · 9e7303c
2 parents 93a1707 + a518192
commit 9e7303c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/corewars-core/src/load_file.rs b/corewars-core/src/load_file.rs
@@ -139,6 +139,8 @@ impl Instruction {
 
 impl fmt::Display for Instruction {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        // https://github.com/rust-lang/rust-clippy/issues/8643
+        #[allow(clippy::format_in_format_args)]
         f.pad(&format!(
             // Example output:
             // MOV.AB  $-100,  $1

diff --git a/corewars-parser/src/phase/expansion.rs b/corewars-parser/src/phase/expansion.rs
@@ -273,7 +273,7 @@ fn expand_lines(lines: &mut Vec<String>, index: usize, span: &Span, substitution
     lines.splice(index..=index, new_lines);
 }
 
-fn substitute_offsets(lines: &mut Vec<String>, labels: &Labels) {
+fn substitute_offsets(lines: &mut [String], labels: &Labels) {
     let mut i = 0;
     for line in lines.iter_mut() {
         let cloned = line.clone();

diff --git a/corewars-sim/src/core.rs b/corewars-sim/src/core.rs
@@ -237,7 +237,7 @@ impl Core {
         let max_cycles = max_cycles.into().unwrap_or(DEFAULT_MAXCYCLES);
 
         while self.steps_taken < max_cycles {
-            let _ = self.step()?;
+            self.step()?;
         }
 
         Ok(())