More explicit lifetimes

Author: Keats

lib/src/sketch_schemes/counts.rs

@@ -22,9 +22,10 @@ impl AllCountsSketcher {
 }
 
 impl SketchScheme for AllCountsSketcher {
-    fn process<'s, 'a: 's, 'b>(&'a mut self, seq: &'s dyn Sequence<'b>)
+    fn process<'seq, 'a, 'inner>(&'a mut self, seq: &'seq dyn Sequence<'inner>)
     where
-        's: 'b,
+        'a: 'seq,
+        'seq: 'inner,
     {
         for (_, kmer, _) in seq.normalize(false).bit_kmers(self.k, false) {
             self.counts[kmer.0 as usize] = self.counts[kmer.0 as usize].saturating_add(1);

lib/src/sketch_schemes/mash.rs

@@ -65,9 +65,10 @@ impl MashSketcher {
 }
 
 impl SketchScheme for MashSketcher {
-    fn process<'s, 'a: 's, 'b>(&'a mut self, seq: &'s dyn Sequence<'b>)
+    fn process<'seq, 'a, 'inner>(&'a mut self, seq: &'seq dyn Sequence<'inner>)
     where
-        's: 'b,
+        'a: 'seq,
+        'seq: 'inner,
     {
         self.total_bases += seq.sequence().len() as u64;
         let rc = seq.reverse_complement();

lib/src/sketch_schemes/mod.rs

@@ -22,9 +22,10 @@ pub struct KmerCount {
 }
 
 pub trait SketchScheme {
-    fn process<'s, 'a: 's, 'b>(&'a mut self, seq: &'s dyn Sequence<'b>)
+    fn process<'seq, 'a, 'inner>(&'a mut self, seq: &'seq dyn Sequence<'inner>)
     where
-        's: 'b;
+        'a: 'seq,
+        'seq: 'inner;
     fn total_bases_and_kmers(&self) -> (u64, u64);
     fn to_vec(&self) -> Vec<KmerCount>;
     fn parameters(&self) -> SketchParams;

lib/src/sketch_schemes/scaled.rs

@@ -63,9 +63,10 @@ impl ScaledSketcher {
 }
 
 impl SketchScheme for ScaledSketcher {
-    fn process<'s, 'a: 's, 'b>(&'a mut self, seq: &'s dyn Sequence<'b>)
+    fn process<'seq, 'a, 'inner>(&'a mut self, seq: &'seq dyn Sequence<'inner>)
     where
-        's: 'b,
+        'a: 'seq,
+        'seq: 'inner,
     {
         self.total_bases += seq.sequence().len() as u64;
         let rc = seq.reverse_complement();