Rust 2018 idioms

src/row.rs

@@ -73,7 +73,7 @@ pub struct MappedRows<'stmt, F> {
 
 impl<'stmt, T, F> MappedRows<'stmt, F>
 where
-    F: FnMut(&Row) -> T,
+    F: FnMut(&Row<'_, '_>) -> T,
 {
     pub(crate) fn new(rows: Rows<'stmt>, f: F) -> MappedRows<'stmt, F> {
         MappedRows { rows, map: f }
@@ -82,7 +82,7 @@ where
 
 impl<'conn, T, F> Iterator for MappedRows<'conn, F>
 where
-    F: FnMut(&Row) -> T,
+    F: FnMut(&Row<'_, '_>) -> T,
 {
     type Item = Result<T>;
 
@@ -103,7 +103,7 @@ pub struct AndThenRows<'stmt, F> {
 
 impl<'stmt, T, E, F> AndThenRows<'stmt, F>
 where
-    F: FnMut(&Row) -> result::Result<T, E>,
+    F: FnMut(&Row<'_, '_>) -> result::Result<T, E>,
 {
     pub(crate) fn new(rows: Rows<'stmt>, f: F) -> AndThenRows<'stmt, F> {
         AndThenRows { rows, map: f }
@@ -113,7 +113,7 @@ where
 impl<'stmt, T, E, F> Iterator for AndThenRows<'stmt, F>
 where
     E: convert::From<Error>,
-    F: FnMut(&Row) -> result::Result<T, E>,
+    F: FnMut(&Row<'_, '_>) -> result::Result<T, E>,
 {
     type Item = result::Result<T, E>;
 
@@ -231,12 +231,12 @@ impl<'a, 'stmt> Row<'a, 'stmt> {
 pub trait RowIndex {
     /// Returns the index of the appropriate column, or `None` if no such
     /// column exists.
-    fn idx(&self, stmt: &Statement) -> Result<usize>;
+    fn idx(&self, stmt: &Statement<'_>) -> Result<usize>;
 }
 
 impl RowIndex for usize {
     #[inline]
-    fn idx(&self, stmt: &Statement) -> Result<usize> {
+    fn idx(&self, stmt: &Statement<'_>) -> Result<usize> {
         if *self >= stmt.column_count() {
             Err(Error::InvalidColumnIndex(*self))
         } else {
@@ -247,7 +247,7 @@ impl RowIndex for usize {
 
 impl<'a> RowIndex for &'a str {
     #[inline]
-    fn idx(&self, stmt: &Statement) -> Result<usize> {
+    fn idx(&self, stmt: &Statement<'_>) -> Result<usize> {
         stmt.column_index(*self)
     }
 }