From e4eff1a3edec523a5ac0c2716573f9ad1ca432ad Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Sun, 10 Mar 2019 17:25:12 -0700
Subject: update a bunch of arm stuff

---
 src/armv7.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/armv7.rs')

diff --git a/src/armv7.rs b/src/armv7.rs
index d65c8ae..222c8a6 100644
--- a/src/armv7.rs
+++ b/src/armv7.rs
@@ -552,21 +552,21 @@ impl ConditionCode {
 }
 
 impl Decodable for Instruction {
-    fn decode<'a, T: IntoIterator<Item=&'a u8>>(bytes: T) -> Option<Self> {
+    fn decode<T: IntoIterator<Item=u8>>(bytes: T) -> Option<Self> {
         let mut blank = Instruction::blank();
         match blank.decode_into(bytes) {
             Some(_) => Some(blank),
             None => None
         }
     }
-    fn decode_into<'a, T: IntoIterator<Item=&'a u8>>(&mut self, bytes: T) -> Option<()> {
-        fn read_word<'a, T: IntoIterator<Item=&'a u8>>(bytes: T) -> Option<u32> {
+    fn decode_into<T: IntoIterator<Item=u8>>(&mut self, bytes: T) -> Option<()> {
+        fn read_word<T: IntoIterator<Item=u8>>(bytes: T) -> Option<u32> {
             let mut iter = bytes.into_iter();
             let instr: u32 =
-                ((*iter.next()? as u32)      ) |
-                ((*iter.next()? as u32) << 8 ) |
-                ((*iter.next()? as u32) << 16) |
-                ((*iter.next()? as u32) << 24);
+                ((iter.next()? as u32)      ) |
+                ((iter.next()? as u32) << 8 ) |
+                ((iter.next()? as u32) << 16) |
+                ((iter.next()? as u32) << 24);
 
             Some(instr)
         }
-- 
cgit v1.1