More rust cleanup

- Remove under_construction.png from the build.rs it has been removed
- Use InstructionIndex in more places
- Add missing PartialOrd and Ord impls for id types

Author: emesare

rust/build.rs

@@ -4,10 +4,6 @@ fn main() {
     let _ = std::fs::create_dir("target");
     let _ = std::fs::create_dir("target/doc");
     let _ = std::fs::copy("../docs/img/favicon.ico", "target/doc/favicon.ico");
-    let _ = std::fs::copy(
-        "assets/under_construction.png",
-        "target/doc/under_construction.png",
-    );
     let _ = std::fs::copy("../docs/img/logo.png", "target/doc/logo.png");
 
     let link_path =

rust/src/architecture.rs

@@ -54,7 +54,7 @@ pub use binaryninjacore_sys::BNLowLevelILFlagCondition as FlagCondition;
 
 macro_rules! newtype {
     ($name:ident, $inner_type:ty) => {
-        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
         pub struct $name(pub $inner_type);
 
         impl From<$inner_type> for $name {

rust/src/llil/instruction.rs

@@ -26,6 +26,12 @@ use crate::architecture::Architecture;
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct InstructionIndex(pub usize);
 
+impl InstructionIndex {
+    pub fn next(&self) -> Self {
+        Self(self.0 + 1)
+    }
+}
+
 impl Display for InstructionIndex {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         f.write_fmt(format_args!("{}", self.0))

rust/src/llil/operation.rs

@@ -412,7 +412,7 @@ where
         Expression::new(self.function, ExpressionIndex(self.op.operands[0] as usize))
     }
 
-    pub fn target_list(&self) -> BTreeMap<u64, usize> {
+    pub fn target_list(&self) -> BTreeMap<u64, InstructionIndex> {
         let mut result = BTreeMap::new();
         let count = self.op.operands[1] as usize / 2;
         let mut list = TargetListIter {
@@ -425,7 +425,7 @@ where
 
         for _ in 0..count {
             let value = list.next();
-            let target = list.next() as usize;
+            let target = InstructionIndex(list.next() as usize);
             result.insert(value, target);
         }