Skip to content

Commit

Permalink
chore: Fix CI (#128)
Browse files Browse the repository at this point in the history
* chore: Update for deprecated APIs

* fix: upgrade protoc dependencies

* fix: upgrade to rust 1.74 so cargo_audit works

* fix: update descriptors for latest protoc

* fix: add newly stringent clippy lint
  • Loading branch information
alamb authored Jul 9, 2024
1 parent 2d5f0aa commit 422824b
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ jobs:
steps:
- checkout
- run:
name: Install protobuf and git
command: pacman -Sy --noconfirm protobuf git && protoc --version
name: Install protobuf and git and dependencies
command: pacman -Sy --noconfirm protobuf git gcc-libs && protoc --version
- run:
name: Regenerate descriptors
working_directory: pbjson-types
Expand Down
5 changes: 5 additions & 0 deletions pbjson-build/src/generator/message.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,11 @@ fn write_serialize_scalar_variable<W: Write>(
"{}#[allow(clippy::needless_borrow)]",
Indent(indent)
)?;
writeln!(
writer,
"{}#[allow(clippy::needless_borrows_for_generic_args)]",
Indent(indent)
)?;
writeln!(
writer,
"{}struct_ser.serialize_field(\"{}\", {}(&{}).as_str())?;",
Expand Down
Binary file modified pbjson-types/descriptors.bin
Binary file not shown.
9 changes: 4 additions & 5 deletions pbjson-types/src/timestamp.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::Timestamp;
use chrono::{DateTime, NaiveDateTime, TimeZone, Utc};
use chrono::{DateTime, Utc};
use serde::de::Visitor;
use serde::Serialize;

Expand All @@ -8,14 +8,13 @@ impl TryFrom<Timestamp> for DateTime<Utc> {
fn try_from(value: Timestamp) -> Result<Self, Self::Error> {
let Timestamp { seconds, nanos } = value;

let dt = NaiveDateTime::from_timestamp_opt(
Self::from_timestamp(
seconds,
nanos
.try_into()
.map_err(|_| "out of range integral type conversion attempted")?,
)
.ok_or("invalid or out-of-range datetime")?;
Ok(Utc.from_utc_datetime(&dt))
.ok_or("invalid or out-of-range datetime")
}
}

Expand All @@ -33,7 +32,7 @@ impl Serialize for Timestamp {
where
S: serde::Serializer,
{
let t: DateTime<Utc> = self.clone().try_into().map_err(serde::ser::Error::custom)?;
let t: DateTime<Utc> = (*self).try_into().map_err(serde::ser::Error::custom)?;
serializer.serialize_str(t.to_rfc3339().as_str())
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.72"
channel = "1.74"
components = ["rustfmt", "clippy"]

0 comments on commit 422824b

Please sign in to comment.