Fix some clippy and deprecation warnings

diesel/src/connection/transaction_manager.rs

@@ -873,7 +873,7 @@ mod test {
             .collect::<Vec<_>>();
 
         results.sort_by_key(|r| r.is_err());
-        assert!(matches!(results[0], Ok(_)), "Got {:?} instead", results);
+        assert!(results[0].is_ok(), "Got {:?} instead", results);
         // Note that contrary to Postgres, this is not a commit failure
         assert!(
             matches!(&results[1], Err(DatabaseError(SerializationFailure, _))),
@@ -982,7 +982,7 @@ mod test {
             .collect::<Vec<_>>();
 
         results.sort_by_key(|r| r.is_err());
-        assert!(matches!(results[0], Ok(_)), "Got {:?} instead", results);
+        assert!(results[0].is_ok(), "Got {:?} instead", results);
         assert!(
             matches!(&results[1], Err(DatabaseError(SerializationFailure, _))),
             "Got {:?} instead",

diesel/src/pg/connection/mod.rs

@@ -850,7 +850,7 @@ mod tests {
 
         results.sort_by_key(|r| r.is_err());
 
-        assert!(matches!(results[0], Ok(_)), "Got {:?} instead", results);
+        assert!(results[0].is_ok(), "Got {:?} instead", results);
         assert!(
             matches!(&results[1], Err(DatabaseError(SerializationFailure, _))),
             "Got {:?} instead",
@@ -966,7 +966,7 @@ mod tests {
 
         results.sort_by_key(|r| r.is_err());
 
-        assert!(matches!(results[0], Ok(_)), "Got {:?} instead", results);
+        assert!(results[0].is_ok(), "Got {:?} instead", results);
         assert!(
             matches!(&results[1], Err(DatabaseError(SerializationFailure, _))),
             "Got {:?} instead",

diesel/src/pg/types/date_and_time/chrono.rs

@@ -65,7 +65,7 @@ impl ToSql<Timestamptz, Pg> for NaiveDateTime {
 impl FromSql<Timestamptz, Pg> for DateTime<Utc> {
     fn from_sql(bytes: PgValue<'_>) -> deserialize::Result<Self> {
         let naive_date_time = <NaiveDateTime as FromSql<Timestamptz, Pg>>::from_sql(bytes)?;
-        Ok(DateTime::from_utc(naive_date_time, Utc))
+        Ok(Utc.from_utc_datetime(&naive_date_time))
     }
 }
 

diesel/src/query_builder/query_id.rs

@@ -136,9 +136,9 @@ mod tests {
     }
 
     #[test]
-    #[cfg(features = "postgres")]
+    #[cfg(feature = "postgres")]
     fn boxed_queries_do_not_have_static_query_id() {
-        use pg::Pg;
+        use crate::pg::Pg;
         assert!(query_id(users::table.into_boxed::<Pg>()).is_none());
     }
 }

diesel/src/sqlite/connection/sqlite_value.rs

@@ -64,7 +64,7 @@ impl<'row, 'stmt, 'query> SqliteValue<'row, 'stmt, 'query> {
         let s = unsafe {
             let ptr = ffi::sqlite3_value_text(self.value.as_ptr());
             let len = ffi::sqlite3_value_bytes(self.value.as_ptr());
-            let bytes = slice::from_raw_parts(ptr as *const u8, len as usize);
+            let bytes = slice::from_raw_parts(ptr, len as usize);
             // The string is guaranteed to be utf8 according to
             // https://www.sqlite.org/c3ref/value_blob.html
             str::from_utf8_unchecked(bytes)

diesel/src/sqlite/types/date_and_time/chrono.rs

@@ -195,7 +195,7 @@ impl FromSql<TimestamptzSqlite, Sqlite> for DateTime<Utc> {
         // Fallback on assuming Utc
         let naive_date_time =
             <NaiveDateTime as FromSql<TimestamptzSqlite, Sqlite>>::from_sql(value)?;
-        Ok(DateTime::from_utc(naive_date_time, Utc))
+        Ok(Utc.from_utc_datetime(&naive_date_time))
     }
 }
 

diesel_cli/tests/migration_generate.rs

@@ -27,7 +27,7 @@ Creating migrations.\\d{4}-\\d{2}-\\d{2}-\\d{6}_hello.down.sql\
     let captured_timestamps = Regex::new(r"(?P<stamp>[\d-]*)_hello").unwrap();
     let mut stamps_found = 0;
     for caps in captured_timestamps.captures_iter(result.stdout()) {
-        let timestamp = Utc.datetime_from_str(&caps["stamp"], TIMESTAMP_FORMAT);
+        let timestamp = NaiveDateTime::parse_from_str(&caps["stamp"], TIMESTAMP_FORMAT);
         assert!(
             timestamp.is_ok(),
             "Found invalid timestamp format: {:?}",

diesel_tests/tests/schema_inference.rs

@@ -229,7 +229,7 @@ mod postgres {
             ts: (Bound::Included(dt), Bound::Unbounded),
             tstz: (
                 Bound::Unbounded,
-                Bound::Excluded(DateTime::<Utc>::from_utc(dt, Utc)),
+                Bound::Excluded(Utc.from_utc_datetime(&dt)),
             ),
             date: (Bound::Included(dt.date()), Bound::Unbounded),
         };

diesel_tests/tests/types_roundtrip.rs

@@ -367,7 +367,7 @@ mod pg_types {
     }
 
     pub fn mk_datetime(data: (i64, u32)) -> DateTime<Utc> {
-        DateTime::from_utc(mk_pg_naive_datetime(data), Utc)
+        Utc.from_utc_datetime(&mk_pg_naive_datetime(data))
     }
 }