revert unneeded changes

Author: nunoplopes

libcc2rs/src/iterators.rs

@@ -259,7 +259,7 @@ pub struct StringIterator<T> {
     ptr: Ptr<T>,
 }
 
-impl<T: 'static> Iterator for StringIterator<T> {
+impl<T> Iterator for StringIterator<T> {
     type Item = Ptr<T>;
     fn next(&mut self) -> Option<Self::Item> {
         // stop before the null terminator at the last position

libcc2rs/src/rc.rs

@@ -316,10 +316,7 @@ impl<T> Ptr<T> {
     }
 
     #[inline]
-    pub fn len(&self) -> usize
-    where
-        T: 'static,
-    {
+    pub fn len(&self) -> usize {
         match &self.kind {
             PtrKind::Null => 0,
             PtrKind::StackSingle(_) | PtrKind::HeapSingle(_) | PtrKind::Field(_) => 1,
@@ -334,10 +331,7 @@ impl<T> Ptr<T> {
     }
 
     #[inline]
-    pub fn is_empty(&self) -> bool
-    where
-        T: 'static,
-    {
+    pub fn is_empty(&self) -> bool {
         match &self.kind {
             PtrKind::Null => true,
             PtrKind::StackSingle(_) | PtrKind::HeapSingle(_) | PtrKind::Field(_) => false,
@@ -376,10 +370,7 @@ impl<T> Ptr<T> {
     }
 
     #[inline]
-    pub fn to_last(&self) -> Self
-    where
-        T: 'static,
-    {
+    pub fn to_last(&self) -> Self {
         // A field is a single object, whose offset is that of the pointer.
         if let PtrKind::Field(_) = self.kind {
             return self.clone();
@@ -391,10 +382,7 @@ impl<T> Ptr<T> {
     }
 
     #[inline]
-    pub fn to_end(&self) -> Self
-    where
-        T: 'static,
-    {
+    pub fn to_end(&self) -> Self {
         if let PtrKind::Field(_) = self.kind {
             return self.offset(1);
         }
@@ -698,7 +686,7 @@ impl<T: std::io::Write + ByteRepr> Ptr<T> {
     }
 }
 
-impl<T: std::cmp::Ord + 'static> Ptr<T> {
+impl<T: std::cmp::Ord> Ptr<T> {
     pub fn sort(&self, last: usize) {
         match self.kind {
             PtrKind::Null => panic!("ub: dereference of null pointer"),
@@ -720,7 +708,7 @@ impl<T: std::cmp::Ord + 'static> Ptr<T> {
     }
 }
 
-impl<T: Clone + 'static> Ptr<T> {
+impl<T: Clone> Ptr<T> {
     pub fn sort_with_cmp<F>(&self, last: usize, mut cmp: F)
     where
         F: FnMut(Ptr<T>, Ptr<T>) -> bool,
@@ -767,7 +755,7 @@ impl<T: Clone + 'static> Ptr<T> {
 
 impl<T> IntoIterator for &Ptr<T>
 where
-    T: Clone + 'static,
+    T: Clone,
 {
     type Item = Ptr<T>;
     type IntoIter = Ptr<T>;
@@ -777,7 +765,7 @@ where
     }
 }
 
-impl<T: 'static> Iterator for Ptr<T> {
+impl<T> Iterator for Ptr<T> {
     type Item = Ptr<T>;
     fn next(&mut self) -> Option<Self::Item> {
         if self.get_offset() < self.len() {

rules/algorithm/tgt_refcount.rs

@@ -6,7 +6,7 @@ use std::cell::RefCell;
 use std::io::Write;
 use std::rc::Rc;
 
-fn f1<T1: Ord + 'static>(a0: Ptr<T1>, a1: Ptr<T1>) {
+fn f1<T1: Ord>(a0: Ptr<T1>, a1: Ptr<T1>) {
     a0.sort(a1.get_offset())
 }
 
@@ -36,7 +36,7 @@ fn f3<T1: PartialEq + Clone + ByteRepr>(a0: Ptr<T1>, a1: Ptr<T1>, a2: T1) -> Ptr
     )
 }
 
-fn f6<T1: Ord + Clone + 'static, T2>(a0: Ptr<T1>, a1: Ptr<T1>, a2: T2)
+fn f6<T1: Ord + Clone, T2>(a0: Ptr<T1>, a1: Ptr<T1>, a2: T2)
 where
     T2: Callable2<Ptr<T1>, Ptr<T1>, bool>,
 {

rules/deque/tgt_refcount.rs

@@ -5,7 +5,7 @@ use libcc2rs::*;
 use std::cell::RefCell;
 use std::rc::Rc;
 
-fn f1<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f1<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_last()
 }
 

rules/vector/tgt_refcount.rs

@@ -45,15 +45,15 @@ fn f9<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0
 }
 
-fn f10<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f10<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_last()
 }
 
 fn f13<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0
 }
 
-fn f17<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f17<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_end()
 }
 
@@ -140,7 +140,7 @@ fn f37<T1: TryFrom<T2>, T2: Clone + ByteRepr>(a0: Ptr<T2>, a1: Ptr<T2>) -> Vec<T
         .collect::<Vec<_>>()
 }
 
-fn f40<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f40<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_end()
 }
 
@@ -163,7 +163,7 @@ fn f43<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0
 }
 
-fn f44<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f44<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_end()
 }
 
@@ -175,7 +175,7 @@ fn f50<T1: ByteRepr>(a0: Ptr<Vec<T1>>, a1: usize) -> Ptr<Vec<T1>> {
     }
 }
 
-fn f51<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f51<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_last()
 }
 
@@ -206,7 +206,7 @@ fn f55<T1: ByteRepr + Clone>(a0: Ptr<Vec<T1>>, a1: &mut Vec<T1>) {
     a0.write(std::mem::take(&mut *a1))
 }
 
-fn f57<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f57<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_end()
 }
 
@@ -232,15 +232,15 @@ fn f68<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0
 }
 
-fn f69<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f69<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_last()
 }
 
 fn f72<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0
 }
 
-fn f76<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f76<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_end()
 }
 
@@ -323,15 +323,15 @@ fn f95<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0
 }
 
-fn f96<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f96<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_end()
 }
 
 fn f98<T1>(a0: Ptr<T1>, a1: usize) -> Ptr<T1> {
     a0.offset(a1 as isize)
 }
 
-fn f99<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f99<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_last()
 }
 
@@ -354,7 +354,7 @@ fn f103<T1: ByteRepr + Clone>(a0: Ptr<Vec<T1>>, a1: &mut Vec<T1>) {
     a0.write(std::mem::take(&mut *a1))
 }
 
-fn f104<T1: 'static>(a0: Ptr<T1>) -> Ptr<T1> {
+fn f104<T1>(a0: Ptr<T1>) -> Ptr<T1> {
     a0.to_end()
 }