Upgrade to Rust 1.77

Author: benesch

.github/workflows/ci.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: sfackler/actions/rustup@master
       - uses: sfackler/actions/rustfmt@master
-  
+
   clippy:
     name: clippy
     runs-on: ubuntu-latest
@@ -55,7 +55,7 @@ jobs:
       - run: docker compose up -d
       - uses: sfackler/actions/rustup@master
         with:
-          version: 1.64.0
+          version: 1.77.0
       - run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
         id: rust-version
       - uses: actions/cache@v3

postgres-protocol/src/types/test.rs

@@ -174,15 +174,15 @@ fn ltree_str() {
     let mut query = vec![1u8];
     query.extend_from_slice("A.B.C".as_bytes());
 
-    assert!(matches!(ltree_from_sql(query.as_slice()), Ok(_)))
+    assert!(ltree_from_sql(query.as_slice()).is_ok())
 }
 
 #[test]
 fn ltree_wrong_version() {
     let mut query = vec![2u8];
     query.extend_from_slice("A.B.C".as_bytes());
 
-    assert!(matches!(ltree_from_sql(query.as_slice()), Err(_)))
+    assert!(ltree_from_sql(query.as_slice()).is_err())
 }
 
 #[test]
@@ -202,15 +202,15 @@ fn lquery_str() {
     let mut query = vec![1u8];
     query.extend_from_slice("A.B.C".as_bytes());
 
-    assert!(matches!(lquery_from_sql(query.as_slice()), Ok(_)))
+    assert!(lquery_from_sql(query.as_slice()).is_ok())
 }
 
 #[test]
 fn lquery_wrong_version() {
     let mut query = vec![2u8];
     query.extend_from_slice("A.B.C".as_bytes());
 
-    assert!(matches!(lquery_from_sql(query.as_slice()), Err(_)))
+    assert!(lquery_from_sql(query.as_slice()).is_err())
 }
 
 #[test]
@@ -230,13 +230,13 @@ fn ltxtquery_str() {
     let mut query = vec![1u8];
     query.extend_from_slice("a & b*".as_bytes());
 
-    assert!(matches!(ltree_from_sql(query.as_slice()), Ok(_)))
+    assert!(ltree_from_sql(query.as_slice()).is_ok())
 }
 
 #[test]
 fn ltxtquery_wrong_version() {
     let mut query = vec![2u8];
     query.extend_from_slice("a & b*".as_bytes());
 
-    assert!(matches!(ltree_from_sql(query.as_slice()), Err(_)))
+    assert!(ltree_from_sql(query.as_slice()).is_err())
 }

tokio-postgres/Cargo.toml

@@ -79,7 +79,6 @@ eui48-04 = { version = "0.4", package = "eui48" }
 eui48-1 = { version = "1.0", package = "eui48" }
 geo-types-06 = { version = "0.6", package = "geo-types" }
 geo-types-07 = { version = "0.7", package = "geo-types" }
-serde-1 = { version = "1.0", package = "serde" }
 serde_json-1 = { version = "1.0", package = "serde_json" }
 smol_str-01 = { version = "0.1", package = "smol_str" }
 uuid-08 = { version = "0.8", package = "uuid" }

tokio-postgres/src/client.rs

@@ -27,7 +27,9 @@ use postgres_protocol::message::{backend::Message, frontend};
 use postgres_types::BorrowToSql;
 use std::collections::HashMap;
 use std::fmt;
+#[cfg(feature = "runtime")]
 use std::net::IpAddr;
+#[cfg(feature = "runtime")]
 use std::path::PathBuf;
 use std::sync::Arc;
 use std::task::{Context, Poll};

tokio-postgres/src/config.rs

@@ -622,7 +622,7 @@ impl Config {
             "application_name" => {
                 self.application_name(value);
             }
-            "sslcert" => match std::fs::read(&value) {
+            "sslcert" => match std::fs::read(value) {
                 Ok(contents) => {
                     self.ssl_cert(&contents);
                 }
@@ -633,7 +633,7 @@ impl Config {
             "sslcert_inline" => {
                 self.ssl_cert(value.as_bytes());
             }
-            "sslkey" => match std::fs::read(&value) {
+            "sslkey" => match std::fs::read(value) {
                 Ok(contents) => {
                     self.ssl_key(&contents);
                 }
@@ -655,7 +655,7 @@ impl Config {
                 };
                 self.ssl_mode(mode);
             }
-            "sslrootcert" => match std::fs::read(&value) {
+            "sslrootcert" => match std::fs::read(value) {
                 Ok(contents) => {
                     self.ssl_root_cert(&contents);
                 }

tokio-postgres/src/connect_socket.rs

@@ -38,7 +38,7 @@ pub(crate) async fn connect_socket(
                     .map_err(Error::connect)?;
             }
 
-            return Ok(Socket::new_tcp(stream));
+            Ok(Socket::new_tcp(stream))
         }
         #[cfg(unix)]
         Addr::Unix(dir) => {

tokio-postgres/tests/test/main.rs

@@ -330,7 +330,7 @@ async fn simple_query() {
     }
     match &messages[2] {
         SimpleQueryMessage::Row(row) => {
-            assert_eq!(row.columns().get(0).map(|c| c.name()), Some("id"));
+            assert_eq!(row.columns().first().map(|c| c.name()), Some("id"));
             assert_eq!(row.columns().get(1).map(|c| c.name()), Some("name"));
             assert_eq!(row.get(0), Some("1"));
             assert_eq!(row.get(1), Some("steven"));
@@ -339,7 +339,7 @@ async fn simple_query() {
     }
     match &messages[3] {
         SimpleQueryMessage::Row(row) => {
-            assert_eq!(row.columns().get(0).map(|c| c.name()), Some("id"));
+            assert_eq!(row.columns().first().map(|c| c.name()), Some("id"));
             assert_eq!(row.columns().get(1).map(|c| c.name()), Some("name"));
             assert_eq!(row.get(0), Some("2"));
             assert_eq!(row.get(1), Some("joe"));