clippy suggestions

Author: Vanille-N

src/borrow_tracker/mod.rs

@@ -242,7 +242,7 @@ impl Method {
         })
     }
 
-    pub fn new_allocation<'b, 'mir, 'tcx>(
+    pub fn new_allocation<'mir, 'tcx>(
         self,
         id: AllocId,
         alloc: &Allocation,
@@ -276,24 +276,21 @@ impl State {
         }
     }
 
-    pub fn before_memory_read<'tcx, 'mir, 'ecx>(
+    pub fn before_memory_read<'tcx, 'mir>(
         &self,
         alloc_id: AllocId,
         prov_extra: ProvenanceExtra,
         range: AllocRange,
         state: &GlobalState,
         machine: &MiriMachine<'mir, 'tcx>,
-    ) -> InterpResult<'tcx>
-    where
-        'tcx: 'ecx,
-    {
+    ) -> InterpResult<'tcx> {
         match self {
             State::Stack(sb) =>
                 sb.borrow_mut().before_memory_read(alloc_id, prov_extra, range, state, machine),
         }
     }
 
-    pub fn before_memory_write<'tcx, 'mir, 'ecx>(
+    pub fn before_memory_write<'tcx, 'mir>(
         &mut self,
         alloc_id: AllocId,
         prov_extra: ProvenanceExtra,
@@ -307,7 +304,7 @@ impl State {
         }
     }
 
-    pub fn before_memory_deallocation<'tcx, 'mir, 'ecx>(
+    pub fn before_memory_deallocation<'tcx, 'mir>(
         &mut self,
         alloc_id: AllocId,
         prov_extra: ProvenanceExtra,
@@ -323,7 +320,7 @@ impl State {
 
     pub fn remove_unreachable_tags(&self, tags: &FxHashSet<BorTag>) {
         match self {
-            State::Stack(sb) => sb.borrow_mut().remove_unreachable_tags(&tags),
+            State::Stack(sb) => sb.borrow_mut().remove_unreachable_tags(tags),
         }
     }
 

src/machine.rs

@@ -479,7 +479,7 @@ impl<'mir, 'tcx> MiriMachine<'mir, 'tcx> {
         });
         let rng = StdRng::seed_from_u64(config.seed.unwrap_or(0));
         let borrow_tracker_method = config.borrow_tracker;
-        let borrow_tracker_data = borrow_tracker_method.instanciate_global_state(&config);
+        let borrow_tracker_data = borrow_tracker_method.instanciate_global_state(config);
         let data_race = config.data_race_detector.then(|| data_race::GlobalState::new(config));
         MiriMachine {
             tcx: layout_cx.tcx,
@@ -916,11 +916,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
         let buffer_alloc = ecx.machine.weak_memory.then(weak_memory::AllocExtra::new_allocation);
         let alloc: Allocation<Provenance, Self::AllocExtra> = alloc.adjust_from_tcx(
             &ecx.tcx,
-            AllocExtra {
-                borrow_tracker: borrow_tracker,
-                data_race: race_alloc,
-                weak_memory: buffer_alloc,
-            },
+            AllocExtra { borrow_tracker, data_race: race_alloc, weak_memory: buffer_alloc },
             |ptr| ecx.global_base_pointer(ptr),
         )?;
         Ok(Cow::Owned(alloc))