Add Self: 'a clauses

Author: vandenheuvel

examples/max_flow.rs

@@ -143,7 +143,7 @@ where
     F: SparseElement<F> + Zero + Eq + NonZero,
 {
     type Column = Column;
-    type Cost<'a> = Cost;
+    type Cost<'a> where Self: 'a = Cost;
     type Rhs = F;
 
     fn column(&self, j: usize) -> Self::Column {

src/algorithm/two_phase/matrix_provider/column/mod.rs

@@ -36,7 +36,7 @@ pub trait Column: ColumnIntoIterator<Self::F> + Debug {
     /// Type of struct to iterate over this column.
     ///
     /// It should be somewhat cheaply cloneable and as such not be too large.
-    type Iter<'a>: ColumnIterator<'a, F=Self::F>;
+    type Iter<'a>: ColumnIterator<'a, F=Self::F> where Self: 'a;
 
     /// Derive the iterator object.
     ///

src/algorithm/two_phase/matrix_provider/filter/generic_wrapper.rs

@@ -226,7 +226,7 @@ where
     MP: MatrixProvider<Column: IntoFilteredColumn>,
 {
     type Column = <MP::Column as IntoFilteredColumn>::Filtered;
-    type Cost<'a> = MP::Cost<'a>;
+    type Cost<'a> where Self: 'a = MP::Cost<'a>;
     type Rhs = MP::Rhs;
 
     fn column(&self, j: usize) -> Self::Column {

src/algorithm/two_phase/matrix_provider/filter/mod.rs

@@ -18,7 +18,7 @@ pub trait Filtered: MatrixProvider {
 /// Derive a variant of the matrix provider that has rows removed from it.
 pub trait ToFiltered: MatrixProvider {
     /// The resulting matrix provider type.
-    type Filtered<'provider>: Filtered<Column: Column<F=<Self::Column as Column>::F>>;
+    type Filtered<'provider>: Filtered<Column: Column<F=<Self::Column as Column>::F>> where Self: 'provider;
 
     /// Derive a variant of the matrix provider that has rows removed from it.
     ///

src/algorithm/two_phase/matrix_provider/matrix_data.rs

@@ -284,7 +284,7 @@ where
     for<'r> &'r F: FieldRef<F>,
 {
     type Column = Column<F>;
-    type Cost<'a> = Option<&'a <Self::Column as ColumnTrait>::F>;
+    type Cost<'a> where Self: 'a = Option<&'a <Self::Column as ColumnTrait>::F>;
     type Rhs = F;
 
     #[inline]

src/algorithm/two_phase/matrix_provider/mod.rs

@@ -45,7 +45,7 @@ pub trait MatrixProvider {
     ///
     /// This type will often be of the form `Option<_>` so to not have to store any zero values, the
     /// inner type would never be zero in that case.
-    type Cost<'a>;
+    type Cost<'a> where Self: 'a;
 
     /// Right hand side type.
     type Rhs: ops::Rhs;

src/data/linear_algebra/vector/sparse.rs

@@ -203,7 +203,7 @@ where
     C: SparseComparator,
 {
     type F = F;
-    type Iter<'a> = SparseSliceIterator<'a, F>;
+    type Iter<'a> where C: 'a = SparseSliceIterator<'a, F>;
 
     fn iter(&self) -> Self::Iter<'_> {
         SparseSliceIterator::new(&self.data)