Clippy

Author: toolCHAINZ

Cargo.toml

@@ -25,7 +25,6 @@ bundled = ["z3/bundled"]
 opt-level = 3
 
 [dependencies]
-elf = "0.7.4"
 jingle = { git = "https://github.com/toolCHAINZ/jingle", branch = "dev", features = ["gimli"] }
 z3 = { git = "https://github.com/prove-rs/z3.rs.git", branch = "master" }
 serde = { version = "1.0.203", features = ["derive"] }

src/config/constraint.rs

@@ -125,11 +125,11 @@ pub fn gen_memory_constraint(
        + Sync
        + Clone
        + 'static {
-    return move |jingle, state, _addr| {
+    move |jingle, state, _addr| {
         let data = state.read_varnode(&state.varnode(&m.space, m.address, m.size).unwrap())?;
         let constraint = data._eq(&BV::from_u64(jingle.z3, m.value as u64, data.get_size()));
         Ok(constraint)
-    };
+    }
 }
 
 /// Generates a state constraint that a given varnode must be equal to a given value
@@ -142,11 +142,11 @@ pub fn gen_register_constraint(
        + Send
        + Sync
        + Clone {
-    return move |jingle, state, _addr| {
+    move |jingle, state, _addr| {
         let data = state.read_varnode(&vn)?;
         let constraint = data._eq(&BV::from_u64(jingle.z3, value, data.get_size()));
         Ok(constraint)
-    };
+    }
 }
 
 /// Generates a constraint enforcing that the given varnode contains a pointer into the default
@@ -157,7 +157,7 @@ pub fn gen_register_pointer_constraint<'ctx>(
     m: Option<PointerRangeConstraints>,
 ) -> impl for<'a> Fn(&JingleContext<'a>, &State<'a>, u64) -> Result<Bool<'a>, CrackersError> + 'ctx + Clone
 {
-    return move |jingle, state, _addr| {
+    move |jingle, state, _addr| {
         let m = m.clone();
         let val = value
             .as_bytes()
@@ -186,7 +186,7 @@ pub fn gen_register_pointer_constraint<'ctx>(
             }
         }
         Ok(constraint)
-    };
+    }
 }
 
 /// Generates an invariant enforcing that the given varnode, read from a given state, is within
@@ -200,7 +200,7 @@ pub fn gen_pointer_range_state_invariant<'ctx>(
 ) -> Result<Option<Bool<'a>>, CrackersError>
        + 'ctx
        + Clone {
-    return move |jingle, vn, state| {
+    move |jingle, vn, state| {
         match vn {
             ResolvedVarnode::Direct(d) => {
                 // todo: this is gross
@@ -228,7 +228,7 @@ pub fn gen_pointer_range_state_invariant<'ctx>(
                 Ok(Some(Bool::or(jingle.z3, terms.as_slice())))
             }
         }
-    };
+    }
 }
 
 pub fn gen_pointer_range_transition_invariant(
@@ -238,7 +238,7 @@ pub fn gen_pointer_range_transition_invariant(
        + Sync
        + Clone
        + 'static {
-    return move |jingle, block| {
+    move |jingle, block| {
         let mut bools = vec![];
         if let Some(r) = &m.read {
             let inv = gen_pointer_range_state_invariant(r.clone());
@@ -257,5 +257,5 @@ pub fn gen_pointer_range_transition_invariant(
             }
         }
         Ok(Some(Bool::and(jingle.z3, &bools)))
-    };
+    }
 }

src/gadget/another_iterator.rs

@@ -32,7 +32,7 @@ where
         }
     }
 }
-impl<'ctx, 'a, T> Iterator for TraceCandidateIterator<'ctx, 'a, T>
+impl<'a, T> Iterator for TraceCandidateIterator<'_, 'a, T>
 where
     T: Iterator<Item = &'a Gadget>,
 {

src/gadget/candidates.rs

@@ -39,7 +39,7 @@ impl CandidateBuilder {
             }
         }
         // We never found ANY candidates for ANYTHING
-        if candidates.len() == 0 {
+        if candidates.is_empty() {
             Err(UnsimulatedOperation { index: 0 })
         }
         // We never found candidates for something

src/gadget/library/mod.rs

@@ -105,7 +105,7 @@ impl RegisterManager for GadgetLibrary {
     }
 
     fn get_register_name(&self, location: &VarNode) -> Option<&str> {
-        self.varnode_to_register.get(&location).map(|c| c.as_str())
+        self.varnode_to_register.get(location).map(|c| c.as_str())
     }
 
     fn get_registers(&self) -> Vec<(VarNode, String)> {
@@ -118,12 +118,10 @@ mod tests {
     use std::fs;
     use std::path::Path;
 
-    use elf::endian::AnyEndian;
-    use elf::ElfBytes;
-    use jingle::sleigh::context::SleighContextBuilder;
-
     use crate::gadget::library::builder::GadgetLibraryParams;
     use crate::gadget::library::GadgetLibrary;
+    use jingle::sleigh::context::SleighContextBuilder;
+    use object::File;
 
     #[test]
     fn test_load_library() {
@@ -132,12 +130,9 @@ mod tests {
                 .unwrap();
         let path = Path::new("../bin/vuln");
         let data = fs::read(path).unwrap();
-        let elf = ElfBytes::<AnyEndian>::minimal_parse(data.as_slice()).unwrap();
-
-        let bin_sleigh = builder
-            .set_image(Image::try_from(elf).unwrap())
-            .build("x86:LE:64:default")
-            .unwrap();
+        let file = File::parse(&*data).unwrap();
+        let sleigh = builder.build("x86:LE:64:default").unwrap();
+        let bin_sleigh = sleigh.initialize_with_image(file).unwrap();
         let _lib =
             GadgetLibrary::build_from_image(bin_sleigh, &GadgetLibraryParams::default()).unwrap();
     }

src/gadget/signature.rs

@@ -65,7 +65,7 @@ impl GadgetSignature {
     }
 }
 
-impl<'ctx> From<&ModeledBlock<'ctx>> for GadgetSignature {
+impl From<&ModeledBlock<'_>> for GadgetSignature {
     fn from(value: &ModeledBlock) -> Self {
         let mut outputs = Vec::new();
         let mut inputs = Vec::new();

src/synthesis/selection_strategy/mod.rs

@@ -16,7 +16,7 @@ pub trait InstrLen {
     fn instr_len(&self) -> usize;
 }
 
-impl<'ctx> InstrLen for ModeledBlock<'ctx> {
+impl InstrLen for ModeledBlock<'_> {
     fn instr_len(&self) -> usize {
         self.instructions.len()
     }
@@ -33,7 +33,7 @@ impl<T: InstrLen> InstrLen for &T {
         (*self).instr_len()
     }
 }
-impl<'ctx> InstrLen for ModeledInstruction<'ctx> {
+impl InstrLen for ModeledInstruction<'_> {
     fn instr_len(&self) -> usize {
         1
     }
@@ -70,7 +70,7 @@ pub enum OuterProblem<'ctx> {
     OptimizeProb(OptimizationProblem<'ctx>),
 }
 
-impl<'ctx> OuterProblem<'ctx> {
+impl OuterProblem<'_> {
     pub(crate) fn get_assignments(&mut self) -> Result<AssignmentResult, CrackersError> {
         match self {
             OuterProblem::SatProb(s) => s.get_assignments(),

src/synthesis/slot_assignments/display.rs

@@ -10,7 +10,7 @@ pub(crate) struct SlotAssignmentConflictDisplay<'a> {
     pub(crate) conflict: &'a ConflictClause,
 }
 
-impl<'a> Display for SlotAssignmentConflictDisplay<'a> {
+impl Display for SlotAssignmentConflictDisplay<'_> {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self.conflict.precondition {
             true => write!(f, "!")?,