Make elided lifetimes for PgValue/MysqlValue explicit

weiznich · weiznich · commit 495f46e65b43 · 2019-09-20T11:05:22.000+02:00
diff --git a/diesel/src/mysql/connection/bind.rs b/diesel/src/mysql/connection/bind.rs
@@ -86,7 +86,7 @@ impl Binds {
         }
     }
 
-    pub fn field_data(&self, idx: usize) -> Option<MysqlValue> {
+    pub fn field_data(&self, idx: usize) -> Option<MysqlValue<'_>> {
         self.data[idx].bytes().map(MysqlValue::new)
     }
 }
diff --git a/diesel/src/mysql/connection/stmt/iterator.rs b/diesel/src/mysql/connection/stmt/iterator.rs
@@ -50,7 +50,7 @@ pub struct MysqlRow<'a> {
 }
 
 impl<'a> Row<Mysql> for MysqlRow<'a> {
-    fn take(&mut self) -> Option<MysqlValue> {
+    fn take(&mut self) -> Option<MysqlValue<'_>> {
         let current_idx = self.col_idx;
         self.col_idx += 1;
         self.binds.field_data(current_idx)
@@ -116,7 +116,7 @@ impl<'a> NamedRow<Mysql> for NamedMysqlRow<'a> {
         self.column_indices.get(column_name).cloned()
     }
 
-    fn get_raw_value(&self, idx: usize) -> Option<MysqlValue> {
+    fn get_raw_value(&self, idx: usize) -> Option<MysqlValue<'_>> {
         self.binds.field_data(idx)
     }
 }
diff --git a/diesel/src/mysql/types/date_and_time.rs b/diesel/src/mysql/types/date_and_time.rs
@@ -25,7 +25,7 @@ macro_rules! mysql_time_impls {
         }
 
         impl FromSql<$ty, Mysql> for ffi::MYSQL_TIME {
-            fn from_sql(value: Option<MysqlValue>) -> deserialize::Result<Self> {
+            fn from_sql(value: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
                 let value = not_none!(value);
                 let bytes_ptr = value.as_bytes().as_ptr() as *const ffi::MYSQL_TIME;
                 unsafe {
@@ -55,7 +55,7 @@ impl ToSql<Datetime, Mysql> for NaiveDateTime {
 }
 
 impl FromSql<Datetime, Mysql> for NaiveDateTime {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         <NaiveDateTime as FromSql<Timestamp, Mysql>>::from_sql(bytes)
     }
 }
@@ -77,7 +77,7 @@ impl ToSql<Timestamp, Mysql> for NaiveDateTime {
 }
 
 impl FromSql<Timestamp, Mysql> for NaiveDateTime {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let mysql_time = <ffi::MYSQL_TIME as FromSql<Timestamp, Mysql>>::from_sql(bytes)?;
 
         NaiveDate::from_ymd_opt(
@@ -110,7 +110,7 @@ impl ToSql<Time, Mysql> for NaiveTime {
 }
 
 impl FromSql<Time, Mysql> for NaiveTime {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let mysql_time = <ffi::MYSQL_TIME as FromSql<Time, Mysql>>::from_sql(bytes)?;
         NaiveTime::from_hms_opt(
             mysql_time.hour as u32,
@@ -134,7 +134,7 @@ impl ToSql<Date, Mysql> for NaiveDate {
 }
 
 impl FromSql<Date, Mysql> for NaiveDate {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let mysql_time = <ffi::MYSQL_TIME as FromSql<Date, Mysql>>::from_sql(bytes)?;
         NaiveDate::from_ymd_opt(
             mysql_time.year as i32,
diff --git a/diesel/src/mysql/types/mod.rs b/diesel/src/mysql/types/mod.rs
@@ -19,7 +19,7 @@ impl ToSql<TinyInt, Mysql> for i8 {
 }
 
 impl FromSql<TinyInt, Mysql> for i8 {
-    fn from_sql(value: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(value: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(value);
         let bytes = value.as_bytes();
         Ok(bytes[0] as i8)
@@ -37,7 +37,7 @@ impl ToSql<Unsigned<TinyInt>, Mysql> for u8 {
 }
 
 impl FromSql<Unsigned<TinyInt>, Mysql> for u8 {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let signed: i8 = FromSql::<TinyInt, Mysql>::from_sql(bytes)?;
         Ok(signed as u8)
     }
@@ -50,7 +50,7 @@ impl ToSql<Unsigned<SmallInt>, Mysql> for u16 {
 }
 
 impl FromSql<Unsigned<SmallInt>, Mysql> for u16 {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let signed: i16 = FromSql::<SmallInt, Mysql>::from_sql(bytes)?;
         Ok(signed as u16)
     }
@@ -63,7 +63,7 @@ impl ToSql<Unsigned<Integer>, Mysql> for u32 {
 }
 
 impl FromSql<Unsigned<Integer>, Mysql> for u32 {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let signed: i32 = FromSql::<Integer, Mysql>::from_sql(bytes)?;
         Ok(signed as u32)
     }
@@ -76,7 +76,7 @@ impl ToSql<Unsigned<BigInt>, Mysql> for u64 {
 }
 
 impl FromSql<Unsigned<BigInt>, Mysql> for u64 {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         let signed: i64 = FromSql::<BigInt, Mysql>::from_sql(bytes)?;
         Ok(signed as u64)
     }
@@ -90,7 +90,7 @@ impl ToSql<Bool, Mysql> for bool {
 }
 
 impl FromSql<Bool, Mysql> for bool {
-    fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {
         Ok(not_none!(bytes).as_bytes().iter().any(|x| *x != 0))
     }
 }
diff --git a/diesel/src/pg/connection/row.rs b/diesel/src/pg/connection/row.rs
@@ -20,7 +20,7 @@ impl<'a> PgRow<'a> {
 }
 
 impl<'a> Row<Pg> for PgRow<'a> {
-    fn take(&mut self) -> Option<PgValue> {
+    fn take(&mut self) -> Option<PgValue<'_>> {
         let current_idx = self.col_idx;
         self.col_idx += 1;
         let raw = self.db_result.get(self.row_idx, current_idx)?;
@@ -49,7 +49,7 @@ impl<'a> PgNamedRow<'a> {
 }
 
 impl<'a> NamedRow<Pg> for PgNamedRow<'a> {
-    fn get_raw_value(&self, index: usize) -> Option<PgValue> {
+    fn get_raw_value(&self, index: usize) -> Option<PgValue<'_>> {
         let raw = self.cursor.get_value(self.idx, index)?;
         Some(PgValue::new(
             raw,
diff --git a/diesel/src/pg/types/array.rs b/diesel/src/pg/types/array.rs
@@ -23,7 +23,7 @@ impl<T, ST> FromSql<Array<ST>, Pg> for Vec<T>
 where
     T: FromSql<ST, Pg>,
 {
-    fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(value);
         let mut bytes = value.as_bytes();
         let num_dimensions = bytes.read_i32::<NetworkEndian>()?;
diff --git a/diesel/src/pg/types/date_and_time/chrono.rs b/diesel/src/pg/types/date_and_time/chrono.rs
@@ -19,7 +19,7 @@ fn pg_epoch() -> NaiveDateTime {
 }
 
 impl FromSql<Timestamp, Pg> for NaiveDateTime {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let PgTimestamp(offset) = FromSql::<Timestamp, Pg>::from_sql(bytes)?;
         match pg_epoch().checked_add_signed(Duration::microseconds(offset)) {
             Some(v) => Ok(v),
@@ -46,7 +46,7 @@ impl ToSql<Timestamp, Pg> for NaiveDateTime {
 }
 
 impl FromSql<Timestamptz, Pg> for NaiveDateTime {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         FromSql::<Timestamp, Pg>::from_sql(bytes)
     }
 }
@@ -58,7 +58,7 @@ impl ToSql<Timestamptz, Pg> for NaiveDateTime {
 }
 
 impl FromSql<Timestamptz, Pg> for DateTime<Utc> {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let naive_date_time = <NaiveDateTime as FromSql<Timestamptz, Pg>>::from_sql(bytes)?;
         Ok(DateTime::from_utc(naive_date_time, Utc))
     }
@@ -85,7 +85,7 @@ impl ToSql<Time, Pg> for NaiveTime {
 }
 
 impl FromSql<Time, Pg> for NaiveTime {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let PgTime(offset) = FromSql::<Time, Pg>::from_sql(bytes)?;
         let duration = Duration::microseconds(offset);
         Ok(midnight() + duration)
@@ -104,7 +104,7 @@ impl ToSql<Date, Pg> for NaiveDate {
 }
 
 impl FromSql<Date, Pg> for NaiveDate {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let PgDate(offset) = FromSql::<Date, Pg>::from_sql(bytes)?;
         match pg_epoch_date().checked_add_signed(Duration::days(i64::from(offset))) {
             Some(date) => Ok(date),
diff --git a/diesel/src/pg/types/date_and_time/deprecated_time.rs b/diesel/src/pg/types/date_and_time/deprecated_time.rs
@@ -27,7 +27,7 @@ impl ToSql<sql_types::Timestamp, Pg> for Timespec {
 }
 
 impl FromSql<sql_types::Timestamp, Pg> for Timespec {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let t = <i64 as FromSql<sql_types::BigInt, Pg>>::from_sql(bytes)?;
         let pg_epoch = Timespec::new(TIME_SEC_CONV, 0);
         let duration = Duration::microseconds(t);
diff --git a/diesel/src/pg/types/date_and_time/mod.rs b/diesel/src/pg/types/date_and_time/mod.rs
@@ -89,7 +89,7 @@ impl ToSql<sql_types::Timestamp, Pg> for PgTimestamp {
 }
 
 impl FromSql<sql_types::Timestamp, Pg> for PgTimestamp {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         FromSql::<sql_types::BigInt, Pg>::from_sql(bytes).map(PgTimestamp)
     }
 }
@@ -101,7 +101,7 @@ impl ToSql<sql_types::Timestamptz, Pg> for PgTimestamp {
 }
 
 impl FromSql<sql_types::Timestamptz, Pg> for PgTimestamp {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         FromSql::<sql_types::Timestamp, Pg>::from_sql(bytes)
     }
 }
@@ -113,7 +113,7 @@ impl ToSql<sql_types::Date, Pg> for PgDate {
 }
 
 impl FromSql<sql_types::Date, Pg> for PgDate {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         FromSql::<sql_types::Integer, Pg>::from_sql(bytes).map(PgDate)
     }
 }
@@ -125,7 +125,7 @@ impl ToSql<sql_types::Time, Pg> for PgTime {
 }
 
 impl FromSql<sql_types::Time, Pg> for PgTime {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         FromSql::<sql_types::BigInt, Pg>::from_sql(bytes).map(PgTime)
     }
 }
@@ -140,7 +140,7 @@ impl ToSql<sql_types::Interval, Pg> for PgInterval {
 }
 
 impl FromSql<sql_types::Interval, Pg> for PgInterval {
-    fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(value);
         Ok(PgInterval {
             microseconds: FromSql::<sql_types::BigInt, Pg>::from_sql(Some(value.subslice(0..8)))?,
diff --git a/diesel/src/pg/types/date_and_time/std_time.rs b/diesel/src/pg/types/date_and_time/std_time.rs
@@ -27,7 +27,7 @@ impl ToSql<sql_types::Timestamp, Pg> for SystemTime {
 }
 
 impl FromSql<sql_types::Timestamp, Pg> for SystemTime {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let usecs_passed = <i64 as FromSql<sql_types::BigInt, Pg>>::from_sql(bytes)?;
         let before_epoch = usecs_passed < 0;
         let time_passed = usecs_to_duration(usecs_passed.abs() as u64);
diff --git a/diesel/src/pg/types/floats/mod.rs b/diesel/src/pg/types/floats/mod.rs
@@ -53,7 +53,7 @@ impl Error for InvalidNumericSign {
 }
 
 impl FromSql<sql_types::Numeric, Pg> for PgNumeric {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let bytes = not_none!(bytes);
         let mut bytes = bytes.as_bytes();
         let digit_count = bytes.read_u16::<NetworkEndian>()?;
diff --git a/diesel/src/pg/types/integers.rs b/diesel/src/pg/types/integers.rs
@@ -7,7 +7,7 @@ use serialize::{self, IsNull, Output, ToSql};
 use sql_types;
 
 impl FromSql<sql_types::Oid, Pg> for u32 {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let bytes = not_none!(bytes);
         let mut bytes = bytes.as_bytes();
         bytes.read_u32::<NetworkEndian>().map_err(Into::into)
diff --git a/diesel/src/pg/types/json.rs b/diesel/src/pg/types/json.rs
@@ -22,7 +22,7 @@ mod foreign_derives {
 }
 
 impl FromSql<sql_types::Json, Pg> for serde_json::Value {
-    fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(value);
         serde_json::from_slice(value.as_bytes()).map_err(Into::into)
     }
@@ -37,7 +37,7 @@ impl ToSql<sql_types::Json, Pg> for serde_json::Value {
 }
 
 impl FromSql<sql_types::Jsonb, Pg> for serde_json::Value {
-    fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(value);
         let bytes = value.as_bytes();
         if bytes[0] != 1 {
diff --git a/diesel/src/pg/types/money.rs b/diesel/src/pg/types/money.rs
@@ -24,7 +24,7 @@ use sql_types::{BigInt, Money};
 pub struct PgMoney(pub i64);
 
 impl FromSql<Money, Pg> for PgMoney {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         FromSql::<BigInt, Pg>::from_sql(bytes).map(PgMoney)
     }
 }
diff --git a/diesel/src/pg/types/network_address.rs b/diesel/src/pg/types/network_address.rs
@@ -62,7 +62,7 @@ macro_rules! assert_or_error {
 }
 
 impl FromSql<MacAddr, Pg> for [u8; 6] {
-    fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(value);
         value
             .as_bytes()
@@ -81,7 +81,7 @@ impl ToSql<MacAddr, Pg> for [u8; 6] {
 macro_rules! impl_Sql {
     ($ty: ty, $net_type: expr) => {
         impl FromSql<$ty, Pg> for IpNetwork {
-            fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+            fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
                 // https://github.com/postgres/postgres/blob/55c3391d1e6a201b5b891781d21fe682a8c64fe6/src/include/utils/inet.h#L23-L28
                 let value = not_none!(value);
                 let bytes = value.as_bytes();
diff --git a/diesel/src/pg/types/numeric.rs b/diesel/src/pg/types/numeric.rs
@@ -153,7 +153,7 @@ mod bigdecimal {
     }
 
     impl FromSql<Numeric, Pg> for BigDecimal {
-        fn from_sql(numeric: Option<PgValue>) -> deserialize::Result<Self> {
+        fn from_sql(numeric: Option<PgValue<'_>>) -> deserialize::Result<Self> {
             PgNumeric::from_sql(numeric)?.try_into()
         }
     }
diff --git a/diesel/src/pg/types/primitives.rs b/diesel/src/pg/types/primitives.rs
@@ -6,7 +6,7 @@ use serialize::{self, IsNull, Output, ToSql};
 use sql_types;
 
 impl FromSql<sql_types::Bool, Pg> for bool {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         match bytes {
             Some(bytes) => Ok(bytes.as_bytes()[0] != 0),
             None => Ok(false),
diff --git a/diesel/src/pg/types/ranges.rs b/diesel/src/pg/types/ranges.rs
@@ -78,7 +78,7 @@ impl<T, ST> FromSql<Range<ST>, Pg> for (Bound<T>, Bound<T>)
 where
     T: FromSql<ST, Pg>,
 {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(bytes);
         let mut bytes = value.as_bytes();
         let flags: RangeFlags = RangeFlags::from_bits_truncate(bytes.read_u8()?);
diff --git a/diesel/src/pg/types/record.rs b/diesel/src/pg/types/record.rs
@@ -25,7 +25,7 @@ macro_rules! tuple_impls {
             // but the only other option would be to use `mem::uninitialized`
             // and `ptr::write`.
             #[allow(clippy::eval_order_dependence)]
-            fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+            fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
                 let value = not_none!(value);
                 let mut bytes = value.as_bytes();
                 let num_elements = bytes.read_i32::<NetworkEndian>()?;
diff --git a/diesel/src/pg/types/uuid.rs b/diesel/src/pg/types/uuid.rs
@@ -14,7 +14,7 @@ use sql_types::Uuid;
 struct UuidProxy(uuid::Uuid);
 
 impl FromSql<Uuid, Pg> for uuid::Uuid {
-    fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(value);
         uuid::Uuid::from_bytes(value.as_bytes()).map_err(Into::into)
     }
diff --git a/diesel/src/pg/types/uuid_v0_7.rs b/diesel/src/pg/types/uuid_v0_7.rs
@@ -14,7 +14,7 @@ use sql_types::Uuid;
 struct UuidProxy(uuid::Uuid);
 
 impl FromSql<Uuid, Pg> for uuid::Uuid {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         let value = not_none!(bytes);
         uuid::Uuid::from_slice(value.as_bytes()).map_err(Into::into)
     }
diff --git a/diesel_tests/tests/custom_types.rs b/diesel_tests/tests/custom_types.rs
@@ -37,7 +37,7 @@ impl ToSql<MyType, Pg> for MyEnum {
 }
 
 impl FromSql<MyType, Pg> for MyEnum {
-    fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+    fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
         match not_none!(bytes).as_bytes() {
             b"foo" => Ok(MyEnum::Foo),
             b"bar" => Ok(MyEnum::Bar),
diff --git a/diesel_tests/tests/types.rs b/diesel_tests/tests/types.rs
@@ -1140,7 +1140,7 @@ fn third_party_crates_can_add_new_types() {
     }
 
     impl FromSql<MyInt, Pg> for i32 {
-        fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {
+        fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {
             FromSql::<Integer, Pg>::from_sql(bytes)
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ impl Binds {`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`89`		`- pub fn field_data(&self, idx: usize) -> Option<MysqlValue> {`
	`89`	`+ pub fn field_data(&self, idx: usize) -> Option<MysqlValue<'_>> {`
`90`	`90`	`self.data[idx].bytes().map(MysqlValue::new)`
`91`	`91`	`}`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ pub struct MysqlRow<'a> {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`impl<'a> Row<Mysql> for MysqlRow<'a> {`
`53`		`- fn take(&mut self) -> Option<MysqlValue> {`
	`53`	`+ fn take(&mut self) -> Option<MysqlValue<'_>> {`
`54`	`54`	`let current_idx = self.col_idx;`
`55`	`55`	`self.col_idx += 1;`
`56`	`56`	`self.binds.field_data(current_idx)`
`@@ -116,7 +116,7 @@ impl<'a> NamedRow<Mysql> for NamedMysqlRow<'a> {`
`116`	`116`	`self.column_indices.get(column_name).cloned()`
`117`	`117`	`}`
`118`	`118`
`119`		`- fn get_raw_value(&self, idx: usize) -> Option<MysqlValue> {`
	`119`	`+ fn get_raw_value(&self, idx: usize) -> Option<MysqlValue<'_>> {`
`120`	`120`	`self.binds.field_data(idx)`
`121`	`121`	`}`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ macro_rules! mysql_time_impls {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`impl FromSql<$ty, Mysql> for ffi::MYSQL_TIME {`
`28`		`- fn from_sql(value: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`28`	`+ fn from_sql(value: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`29`	`29`	`let value = not_none!(value);`
`30`	`30`	`let bytes_ptr = value.as_bytes().as_ptr() as *const ffi::MYSQL_TIME;`
`31`	`31`	`unsafe {`
`@@ -55,7 +55,7 @@ impl ToSql<Datetime, Mysql> for NaiveDateTime {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`impl FromSql<Datetime, Mysql> for NaiveDateTime {`
`58`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`58`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`59`	`59`	`<NaiveDateTime as FromSql<Timestamp, Mysql>>::from_sql(bytes)`
`60`	`60`	`}`
`61`	`61`	`}`
`@@ -77,7 +77,7 @@ impl ToSql<Timestamp, Mysql> for NaiveDateTime {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`impl FromSql<Timestamp, Mysql> for NaiveDateTime {`
`80`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`80`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`81`	`81`	`let mysql_time = <ffi::MYSQL_TIME as FromSql<Timestamp, Mysql>>::from_sql(bytes)?;`
`82`	`82`
`83`	`83`	`NaiveDate::from_ymd_opt(`
`@@ -110,7 +110,7 @@ impl ToSql<Time, Mysql> for NaiveTime {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`impl FromSql<Time, Mysql> for NaiveTime {`
`113`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`113`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`114`	`114`	`let mysql_time = <ffi::MYSQL_TIME as FromSql<Time, Mysql>>::from_sql(bytes)?;`
`115`	`115`	`NaiveTime::from_hms_opt(`
`116`	`116`	`mysql_time.hour as u32,`
`@@ -134,7 +134,7 @@ impl ToSql<Date, Mysql> for NaiveDate {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`impl FromSql<Date, Mysql> for NaiveDate {`
`137`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`137`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`138`	`138`	`let mysql_time = <ffi::MYSQL_TIME as FromSql<Date, Mysql>>::from_sql(bytes)?;`
`139`	`139`	`NaiveDate::from_ymd_opt(`
`140`	`140`	`mysql_time.year as i32,`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ impl ToSql<TinyInt, Mysql> for i8 {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`impl FromSql<TinyInt, Mysql> for i8 {`
`22`		`- fn from_sql(value: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`22`	`+ fn from_sql(value: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`23`	`23`	`let value = not_none!(value);`
`24`	`24`	`let bytes = value.as_bytes();`
`25`	`25`	`Ok(bytes[0] as i8)`
`@@ -37,7 +37,7 @@ impl ToSql<Unsigned<TinyInt>, Mysql> for u8 {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`impl FromSql<Unsigned<TinyInt>, Mysql> for u8 {`
`40`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`40`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`41`	`41`	`let signed: i8 = FromSql::<TinyInt, Mysql>::from_sql(bytes)?;`
`42`	`42`	`Ok(signed as u8)`
`43`	`43`	`}`
`@@ -50,7 +50,7 @@ impl ToSql<Unsigned<SmallInt>, Mysql> for u16 {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`impl FromSql<Unsigned<SmallInt>, Mysql> for u16 {`
`53`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`53`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`54`	`54`	`let signed: i16 = FromSql::<SmallInt, Mysql>::from_sql(bytes)?;`
`55`	`55`	`Ok(signed as u16)`
`56`	`56`	`}`
`@@ -63,7 +63,7 @@ impl ToSql<Unsigned<Integer>, Mysql> for u32 {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`impl FromSql<Unsigned<Integer>, Mysql> for u32 {`
`66`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`66`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`67`	`67`	`let signed: i32 = FromSql::<Integer, Mysql>::from_sql(bytes)?;`
`68`	`68`	`Ok(signed as u32)`
`69`	`69`	`}`
`@@ -76,7 +76,7 @@ impl ToSql<Unsigned<BigInt>, Mysql> for u64 {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`impl FromSql<Unsigned<BigInt>, Mysql> for u64 {`
`79`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`79`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`80`	`80`	`let signed: i64 = FromSql::<BigInt, Mysql>::from_sql(bytes)?;`
`81`	`81`	`Ok(signed as u64)`
`82`	`82`	`}`
`@@ -90,7 +90,7 @@ impl ToSql<Bool, Mysql> for bool {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`impl FromSql<Bool, Mysql> for bool {`
`93`		`- fn from_sql(bytes: Option<MysqlValue>) -> deserialize::Result<Self> {`
	`93`	`+ fn from_sql(bytes: Option<MysqlValue<'_>>) -> deserialize::Result<Self> {`
`94`	`94`	`Ok(not_none!(bytes).as_bytes().iter().any(\|x\| *x != 0))`
`95`	`95`	`}`
`96`	`96`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ impl<T, ST> FromSql<Array<ST>, Pg> for Vec<T>`
`23`	`23`	`where`
`24`	`24`	`T: FromSql<ST, Pg>,`
`25`	`25`	`{`
`26`		`- fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {`
	`26`	`+ fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`27`	`27`	`let value = not_none!(value);`
`28`	`28`	`let mut bytes = value.as_bytes();`
`29`	`29`	`let num_dimensions = bytes.read_i32::<NetworkEndian>()?;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ fn pg_epoch() -> NaiveDateTime {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`impl FromSql<Timestamp, Pg> for NaiveDateTime {`
`22`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`22`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`23`	`23`	`let PgTimestamp(offset) = FromSql::<Timestamp, Pg>::from_sql(bytes)?;`
`24`	`24`	`match pg_epoch().checked_add_signed(Duration::microseconds(offset)) {`
`25`	`25`	`Some(v) => Ok(v),`
`@@ -46,7 +46,7 @@ impl ToSql<Timestamp, Pg> for NaiveDateTime {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`impl FromSql<Timestamptz, Pg> for NaiveDateTime {`
`49`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`49`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`50`	`50`	`FromSql::<Timestamp, Pg>::from_sql(bytes)`
`51`	`51`	`}`
`52`	`52`	`}`
`@@ -58,7 +58,7 @@ impl ToSql<Timestamptz, Pg> for NaiveDateTime {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`impl FromSql<Timestamptz, Pg> for DateTime<Utc> {`
`61`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`61`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`62`	`62`	`let naive_date_time = <NaiveDateTime as FromSql<Timestamptz, Pg>>::from_sql(bytes)?;`
`63`	`63`	`Ok(DateTime::from_utc(naive_date_time, Utc))`
`64`	`64`	`}`
`@@ -85,7 +85,7 @@ impl ToSql<Time, Pg> for NaiveTime {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`impl FromSql<Time, Pg> for NaiveTime {`
`88`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`88`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`89`	`89`	`let PgTime(offset) = FromSql::<Time, Pg>::from_sql(bytes)?;`
`90`	`90`	`let duration = Duration::microseconds(offset);`
`91`	`91`	`Ok(midnight() + duration)`
`@@ -104,7 +104,7 @@ impl ToSql<Date, Pg> for NaiveDate {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`impl FromSql<Date, Pg> for NaiveDate {`
`107`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`107`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`108`	`108`	`let PgDate(offset) = FromSql::<Date, Pg>::from_sql(bytes)?;`
`109`	`109`	`match pg_epoch_date().checked_add_signed(Duration::days(i64::from(offset))) {`
`110`	`110`	`Some(date) => Ok(date),`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ impl ToSql<sql_types::Timestamp, Pg> for Timespec {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`impl FromSql<sql_types::Timestamp, Pg> for Timespec {`
`30`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`30`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`31`	`31`	`let t = <i64 as FromSql<sql_types::BigInt, Pg>>::from_sql(bytes)?;`
`32`	`32`	`let pg_epoch = Timespec::new(TIME_SEC_CONV, 0);`
`33`	`33`	`let duration = Duration::microseconds(t);`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ impl ToSql<sql_types::Timestamp, Pg> for PgTimestamp {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`impl FromSql<sql_types::Timestamp, Pg> for PgTimestamp {`
`92`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`92`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`93`	`93`	`FromSql::<sql_types::BigInt, Pg>::from_sql(bytes).map(PgTimestamp)`
`94`	`94`	`}`
`95`	`95`	`}`
`@@ -101,7 +101,7 @@ impl ToSql<sql_types::Timestamptz, Pg> for PgTimestamp {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`impl FromSql<sql_types::Timestamptz, Pg> for PgTimestamp {`
`104`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`104`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`105`	`105`	`FromSql::<sql_types::Timestamp, Pg>::from_sql(bytes)`
`106`	`106`	`}`
`107`	`107`	`}`
`@@ -113,7 +113,7 @@ impl ToSql<sql_types::Date, Pg> for PgDate {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`impl FromSql<sql_types::Date, Pg> for PgDate {`
`116`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`116`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`117`	`117`	`FromSql::<sql_types::Integer, Pg>::from_sql(bytes).map(PgDate)`
`118`	`118`	`}`
`119`	`119`	`}`
`@@ -125,7 +125,7 @@ impl ToSql<sql_types::Time, Pg> for PgTime {`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`impl FromSql<sql_types::Time, Pg> for PgTime {`
`128`		`- fn from_sql(bytes: Option<PgValue>) -> deserialize::Result<Self> {`
	`128`	`+ fn from_sql(bytes: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`129`	`129`	`FromSql::<sql_types::BigInt, Pg>::from_sql(bytes).map(PgTime)`
`130`	`130`	`}`
`131`	`131`	`}`
`@@ -140,7 +140,7 @@ impl ToSql<sql_types::Interval, Pg> for PgInterval {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`impl FromSql<sql_types::Interval, Pg> for PgInterval {`
`143`		`- fn from_sql(value: Option<PgValue>) -> deserialize::Result<Self> {`
	`143`	`+ fn from_sql(value: Option<PgValue<'_>>) -> deserialize::Result<Self> {`
`144`	`144`	`let value = not_none!(value);`
`145`	`145`	`Ok(PgInterval {`
`146`	`146`	`microseconds: FromSql::<sql_types::BigInt, Pg>::from_sql(Some(value.subslice(0..8)))?,`