Skip to content

Commit 95e78a9

Browse files
iuioiuasatyarohith
authored andcommitted
refactor: use chrono::DateTime::from_timestamp (#23273)
`chrono::NaiveDateTime::from_timestamp_opt()` was deprecated in chronotope/chrono#1473. Prerequisite for #23272.
1 parent 37d8184 commit 95e78a9

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

cli/util/time.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ pub fn utc_now() -> chrono::DateTime<chrono::Utc> {
1414
let now = std::time::SystemTime::now()
1515
.duration_since(std::time::UNIX_EPOCH)
1616
.expect("system time before Unix epoch");
17-
let naive = chrono::NaiveDateTime::from_timestamp_opt(
18-
now.as_secs() as i64,
19-
now.subsec_nanos(),
20-
)
21-
.unwrap();
22-
chrono::DateTime::from_naive_utc_and_offset(naive, chrono::Utc)
17+
chrono::DateTime::from_timestamp(now.as_secs() as i64, now.subsec_nanos())
18+
.unwrap()
2319
}

ext/cron/time.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ pub fn utc_now() -> chrono::DateTime<chrono::Utc> {
1010
let now = std::time::SystemTime::now()
1111
.duration_since(std::time::UNIX_EPOCH)
1212
.expect("system time before Unix epoch");
13-
let naive = chrono::NaiveDateTime::from_timestamp_opt(
14-
now.as_secs() as i64,
15-
now.subsec_nanos(),
16-
)
17-
.unwrap();
18-
chrono::DateTime::from_naive_utc_and_offset(naive, chrono::Utc)
13+
chrono::DateTime::from_timestamp(now.as_secs() as i64, now.subsec_nanos())
14+
.unwrap()
1915
}

ext/kv/time.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ pub fn utc_now() -> chrono::DateTime<chrono::Utc> {
1010
let now = std::time::SystemTime::now()
1111
.duration_since(std::time::UNIX_EPOCH)
1212
.expect("system time before Unix epoch");
13-
let naive = chrono::NaiveDateTime::from_timestamp_opt(
14-
now.as_secs() as i64,
15-
now.subsec_nanos(),
16-
)
17-
.unwrap();
18-
chrono::DateTime::from_naive_utc_and_offset(naive, chrono::Utc)
13+
chrono::DateTime::from_timestamp(now.as_secs() as i64, now.subsec_nanos())
14+
.unwrap()
1915
}

0 commit comments

Comments
 (0)