Skip to content

Commit ea22fd8

Browse files
beneschbenesch
committed
Upgrade to Rust 1.77
1 parent 6892dd1 commit ea22fd8

File tree

9 files changed

+25
-22
lines changed

9 files changed

+25
-22
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- uses: actions/checkout@v3
2121
- uses: sfackler/actions/rustup@master
2222
- uses: sfackler/actions/rustfmt@master
23-
23+
2424
clippy:
2525
name: clippy
2626
runs-on: ubuntu-latest
@@ -55,7 +55,7 @@ jobs:
5555
- run: docker compose up -d
5656
- uses: sfackler/actions/rustup@master
5757
with:
58-
version: 1.64.0
58+
version: 1.77.0
5959
- run: echo "version=$(rustc --version)" >> $GITHUB_OUTPUT
6060
id: rust-version
6161
- uses: actions/cache@v3

‎postgres-protocol/src/types/test.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ fn ltree_str() {
174174
let mut query = vec![1u8];
175175
query.extend_from_slice("A.B.C".as_bytes());
176176

177-
assert!(matches!(ltree_from_sql(query.as_slice()), Ok(_)))
177+
assert!(ltree_from_sql(query.as_slice()).is_ok())
178178
}
179179

180180
#[test]
181181
fn ltree_wrong_version() {
182182
let mut query = vec![2u8];
183183
query.extend_from_slice("A.B.C".as_bytes());
184184

185-
assert!(matches!(ltree_from_sql(query.as_slice()), Err(_)))
185+
assert!(ltree_from_sql(query.as_slice()).is_err())
186186
}
187187

188188
#[test]
@@ -202,15 +202,15 @@ fn lquery_str() {
202202
let mut query = vec![1u8];
203203
query.extend_from_slice("A.B.C".as_bytes());
204204

205-
assert!(matches!(lquery_from_sql(query.as_slice()), Ok(_)))
205+
assert!(lquery_from_sql(query.as_slice()).is_ok())
206206
}
207207

208208
#[test]
209209
fn lquery_wrong_version() {
210210
let mut query = vec![2u8];
211211
query.extend_from_slice("A.B.C".as_bytes());
212212

213-
assert!(matches!(lquery_from_sql(query.as_slice()), Err(_)))
213+
assert!(lquery_from_sql(query.as_slice()).is_err())
214214
}
215215

216216
#[test]
@@ -230,13 +230,13 @@ fn ltxtquery_str() {
230230
let mut query = vec![1u8];
231231
query.extend_from_slice("a & b*".as_bytes());
232232

233-
assert!(matches!(ltree_from_sql(query.as_slice()), Ok(_)))
233+
assert!(ltree_from_sql(query.as_slice()).is_ok())
234234
}
235235

236236
#[test]
237237
fn ltxtquery_wrong_version() {
238238
let mut query = vec![2u8];
239239
query.extend_from_slice("a & b*".as_bytes());
240240

241-
assert!(matches!(ltree_from_sql(query.as_slice()), Err(_)))
241+
assert!(ltree_from_sql(query.as_slice()).is_err())
242242
}

‎postgres-types/src/chrono_04.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ impl ToSql for NaiveDateTime {
4040
impl<'a> FromSql<'a> for DateTime<Utc> {
4141
fn from_sql(type_: &Type, raw: &[u8]) -> Result<DateTime<Utc>, Box<dyn Error + Sync + Send>> {
4242
let naive = NaiveDateTime::from_sql(type_, raw)?;
43-
Ok(DateTime::from_utc(naive, Utc))
43+
Ok(DateTime::from_naive_utc_and_offset(naive, Utc))
4444
}
4545

4646
accepts!(TIMESTAMPTZ);
@@ -111,7 +111,7 @@ impl<'a> FromSql<'a> for NaiveDate {
111111
let jd = types::date_from_sql(raw)?;
112112
base()
113113
.date()
114-
.checked_add_signed(Duration::days(i64::from(jd)))
114+
.checked_add_signed(Duration::try_days(i64::from(jd)).unwrap())
115115
.ok_or_else(|| "value too large to decode".into())
116116
}
117117

‎tokio-postgres/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ eui48-04 = { version = "0.4", package = "eui48" }
7979
eui48-1 = { version = "1.0", package = "eui48" }
8080
geo-types-06 = { version = "0.6", package = "geo-types" }
8181
geo-types-07 = { version = "0.7", package = "geo-types" }
82-
serde-1 = { version = "1.0", package = "serde" }
8382
serde_json-1 = { version = "1.0", package = "serde_json" }
8483
smol_str-01 = { version = "0.1", package = "smol_str" }
8584
uuid-08 = { version = "0.8", package = "uuid" }

‎tokio-postgres/src/client.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ use postgres_protocol::message::{backend::Message, frontend};
2727
use postgres_types::BorrowToSql;
2828
use std::collections::HashMap;
2929
use std::fmt;
30+
#[cfg(feature = "runtime")]
3031
use std::net::IpAddr;
32+
#[cfg(feature = "runtime")]
3133
use std::path::PathBuf;
3234
use std::sync::Arc;
3335
use std::task::{Context, Poll};

‎tokio-postgres/src/config.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ impl Config {
622622
"application_name" => {
623623
self.application_name(value);
624624
}
625-
"sslcert" => match std::fs::read(&value) {
625+
"sslcert" => match std::fs::read(value) {
626626
Ok(contents) => {
627627
self.ssl_cert(&contents);
628628
}
@@ -633,7 +633,7 @@ impl Config {
633633
"sslcert_inline" => {
634634
self.ssl_cert(value.as_bytes());
635635
}
636-
"sslkey" => match std::fs::read(&value) {
636+
"sslkey" => match std::fs::read(value) {
637637
Ok(contents) => {
638638
self.ssl_key(&contents);
639639
}
@@ -655,7 +655,7 @@ impl Config {
655655
};
656656
self.ssl_mode(mode);
657657
}
658-
"sslrootcert" => match std::fs::read(&value) {
658+
"sslrootcert" => match std::fs::read(value) {
659659
Ok(contents) => {
660660
self.ssl_root_cert(&contents);
661661
}

‎tokio-postgres/src/connect_socket.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub(crate) async fn connect_socket(
3838
.map_err(Error::connect)?;
3939
}
4040

41-
return Ok(Socket::new_tcp(stream));
41+
Ok(Socket::new_tcp(stream))
4242
}
4343
#[cfg(unix)]
4444
Addr::Unix(dir) => {

‎tokio-postgres/tests/test/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ async fn simple_query() {
330330
}
331331
match &messages[2] {
332332
SimpleQueryMessage::Row(row) => {
333-
assert_eq!(row.columns().get(0).map(|c| c.name()), Some("id"));
333+
assert_eq!(row.columns().first().map(|c| c.name()), Some("id"));
334334
assert_eq!(row.columns().get(1).map(|c| c.name()), Some("name"));
335335
assert_eq!(row.get(0), Some("1"));
336336
assert_eq!(row.get(1), Some("steven"));
@@ -339,7 +339,7 @@ async fn simple_query() {
339339
}
340340
match &messages[3] {
341341
SimpleQueryMessage::Row(row) => {
342-
assert_eq!(row.columns().get(0).map(|c| c.name()), Some("id"));
342+
assert_eq!(row.columns().first().map(|c| c.name()), Some("id"));
343343
assert_eq!(row.columns().get(1).map(|c| c.name()), Some("name"));
344344
assert_eq!(row.get(0), Some("2"));
345345
assert_eq!(row.get(1), Some("joe"));

‎tokio-postgres/tests/test/types/chrono_04.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use chrono_04::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, TimeZone, Utc};
1+
use chrono_04::{DateTime, NaiveDate, NaiveDateTime, NaiveTime, Utc};
22
use std::fmt;
33
use tokio_postgres::types::{Date, FromSqlOwned, Timestamp};
44
use tokio_postgres::Client;
@@ -54,8 +54,9 @@ async fn test_date_time_params() {
5454
fn make_check(time: &str) -> (Option<DateTime<Utc>>, &str) {
5555
(
5656
Some(
57-
Utc.datetime_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'")
58-
.unwrap(),
57+
NaiveDateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'")
58+
.unwrap()
59+
.and_utc(),
5960
),
6061
time,
6162
)
@@ -77,8 +78,9 @@ async fn test_with_special_date_time_params() {
7778
fn make_check(time: &str) -> (Timestamp<DateTime<Utc>>, &str) {
7879
(
7980
Timestamp::Value(
80-
Utc.datetime_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'")
81-
.unwrap(),
81+
NaiveDateTime::parse_from_str(time, "'%Y-%m-%d %H:%M:%S.%f'")
82+
.unwrap()
83+
.and_utc(),
8284
),
8385
time,
8486
)

0 commit comments

Comments
 (0)