Quellcode durchsuchen

src: Address more reports from cargo-clippy

We let cargo-clippy fix what it could in the previous commit; let's now
address the few reports that it did not address automatically.
Quentin Monnet vor 2 Jahren
Ursprung
Commit
596dbc82f7
2 geänderte Dateien mit 12 neuen und 11 gelöschten Zeilen
  1. 2 2
      src/asm_parser.rs
  2. 10 9
      src/insn_builder.rs

+ 2 - 2
src/asm_parser.rs

@@ -53,7 +53,7 @@ fn integer<I>(input: I) -> ParseResult<i64, I>
     let hex = string("0x")
         .with(many1(hex_digit()))
         .map(|x: String| u64::from_str_radix(&x, 16).unwrap() as i64);
-    let dec = many1(digit()).map(|x: String| i64::from_str_radix(&x, 10).unwrap());
+    let dec = many1(digit()).map(|x: String| x.parse::<i64>().unwrap());
     (sign, try(hex).or(dec)).map(|(s, x)| s * x).parse_stream(input)
 }
 
@@ -62,7 +62,7 @@ fn register<I>(input: I) -> ParseResult<i64, I>
 {
     char('r')
         .with(many1(digit()))
-        .map(|x: String| i64::from_str_radix(&x, 10).unwrap())
+        .map(|x: String| x.parse::<i64>().unwrap())
         .parse_stream(input)
 }
 

+ 10 - 9
src/insn_builder.rs

@@ -82,15 +82,16 @@ impl<'i, I: Instruction> IntoBytes for &'i I {
     /// [ 1 byte ,      1 byte      , 2 bytes,  4 bytes  ]
     /// [ OP_CODE, SRC_REG | DST_REG, OFFSET , IMMEDIATE ]
     fn into_bytes(self) -> Self::Bytes {
-        let mut buffer = Vec::with_capacity(8);
-        buffer.push(self.opt_code_byte());
-        buffer.push(self.get_src() << 4 | self.get_dst());
-        buffer.push(self.get_off()          as u8);
-        buffer.push((self.get_off() >> 8)   as u8);
-        buffer.push(self.get_imm()          as u8);
-        buffer.push((self.get_imm() >> 8)   as u8);
-        buffer.push((self.get_imm() >> 16)  as u8);
-        buffer.push((self.get_imm() >> 24)  as u8);
+        let mut buffer = vec![
+            self.opt_code_byte(),
+            self.get_src() << 4 | self.get_dst(),
+            self.get_off()          as u8,
+            (self.get_off() >> 8)   as u8,
+            self.get_imm()          as u8,
+            (self.get_imm() >> 8)   as u8,
+            (self.get_imm() >> 16)  as u8,
+            (self.get_imm() >> 24)  as u8,
+        ];
         buffer
     }
 }