From c493689f5dfee2f47a61dd2009fb845018f8aed9 Mon Sep 17 00:00:00 2001 From: Alpha Chen Date: Sun, 8 Jan 2017 14:24:55 -0800 Subject: [PATCH] [2016][rust][23.1] clippy --- 2016/rust/src/assembunny.rs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/2016/rust/src/assembunny.rs b/2016/rust/src/assembunny.rs index 6e31e6f..786cd94 100644 --- a/2016/rust/src/assembunny.rs +++ b/2016/rust/src/assembunny.rs @@ -31,9 +31,9 @@ impl Assembunny { let replacement = match instruction { Instruction::Cpy(a, b) => Instruction::Jnz(a, b), Instruction::Inc(x) => Instruction::Dec(x), - Instruction::Dec(x) => Instruction::Inc(x), - Instruction::Jnz(a, b) => Instruction::Cpy(a, b), + Instruction::Dec(x) | Instruction::Tgl(x) => Instruction::Inc(x), + Instruction::Jnz(a, b) => Instruction::Cpy(a, b), }; self.instructions[i] = replacement; } @@ -169,12 +169,12 @@ pub enum Instruction { impl fmt::Display for Instruction { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self { - &Instruction::Cpy(a, b) => write!(f, "cpy {} {}", a, b), - &Instruction::Inc(a) => write!(f, "inc {}", a), - &Instruction::Dec(a) => write!(f, "dec {}", a), - &Instruction::Jnz(a, b) => write!(f, "jnz {} {}", a, b), - &Instruction::Tgl(a) => write!(f, "tgl {}", a), + match *self { + Instruction::Cpy(a, b) => write!(f, "cpy {} {}", a, b), + Instruction::Inc(a) => write!(f, "inc {}", a), + Instruction::Dec(a) => write!(f, "dec {}", a), + Instruction::Jnz(a, b) => write!(f, "jnz {} {}", a, b), + Instruction::Tgl(a) => write!(f, "tgl {}", a), } } } @@ -187,11 +187,11 @@ pub enum Variable { impl fmt::Display for Variable { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - match self { - &Variable::Register(r) => { + match *self { + Variable::Register(r) => { write!(f, "{}", format!("{:?}", r).to_lowercase()) } - &Variable::Value(v) => write!(f, "{:?}", v), + Variable::Value(v) => write!(f, "{:?}", v), } } }