Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions benzina/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@ rustdoc-args = ["--cfg", "docsrs"]

[dependencies]
diesel = { version = "2.2", default-features = false, optional = true }
serde = { version = "1", optional = true }
serde_json = { version = "1", optional = true }
serde_core = { version = "1.0.221", optional = true }
serde_json = { version = "1.0.144", optional = true }
utoipa = { version = "5", optional = true }
benzina-derive = { path = "../benzina-derive", version = "=0.4.0", optional = true }
uuid = { version = ">=0.7.0, <2.0.0", default-features = false, optional = true }
indexmap = { version = "2.10", optional = true }
rustc-hash = { version = "2.1.1", optional = true }

[dev-dependencies]
serde = "1.0.221"
serde_test = "1"
uuid = { version = ">=0.7.0, <2.0.0", default-features = false, features = ["v4"] }

Expand All @@ -44,13 +45,13 @@ postgres = ["benzina-derive?/postgres", "dep:diesel", "diesel/postgres_backend"]
typed-uuid = ["postgres", "diesel/uuid", "dep:uuid"]
mysql = ["benzina-derive?/mysql"]

serde = ["dep:serde", "uuid?/serde"]
serde = ["dep:serde_core", "uuid?/serde"]
utoipa = ["dep:utoipa"]

example-generated = ["typed-uuid"]
dangerous-construction = ["typed-uuid"]

json = ["postgres", "dep:serde", "dep:serde_json", "diesel/serde_json"]
json = ["postgres", "dep:serde_core", "dep:serde_json", "diesel/serde_json"]
ctid = ["postgres", "diesel/i-implement-a-third-party-backend-and-opt-into-breaking-changes"]

[lints]
Expand Down
2 changes: 1 addition & 1 deletion benzina/src/__private.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pub use ::diesel;
#[cfg(feature = "derive")]
pub use ::indexmap;
#[cfg(feature = "serde")]
pub use ::serde;
pub use ::serde_core;
pub use ::std;
#[cfg(feature = "typed-uuid")]
pub use ::uuid;
Expand Down
2 changes: 1 addition & 1 deletion benzina/src/json/binary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use diesel::{
serialize::ToSql,
sql_types,
};
use serde::{Serialize, de::DeserializeOwned};
use serde_core::{Serialize, de::DeserializeOwned};

use crate::json::convert::{sql_deserialize_binary, sql_serialize_binary};

Expand Down
2 changes: 1 addition & 1 deletion benzina/src/json/convert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use diesel::{
pg::{Pg, PgValue},
serialize::IsNull,
};
use serde::{Serialize, de::DeserializeOwned};
use serde_core::{Serialize, de::DeserializeOwned};

/// Allows using [`deserialize_as`] for benzina [`Json`] and [`Jsonb`] structs.
///
Expand Down
2 changes: 1 addition & 1 deletion benzina/src/json/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use diesel::{
serialize::ToSql,
sql_types,
};
use serde::{Serialize, de::DeserializeOwned};
use serde_core::{Serialize, de::DeserializeOwned};

use crate::json::convert::{sql_deserialize, sql_serialize};

Expand Down
2 changes: 1 addition & 1 deletion benzina/src/json/nullable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use diesel::{
serialize::{IsNull, ToSql},
sql_types::Nullable,
};
use serde::{Serialize, de::DeserializeOwned};
use serde_core::{Serialize, de::DeserializeOwned};

macro_rules! impl_nullable {
(
Expand Down
2 changes: 1 addition & 1 deletion benzina/src/serde.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::fmt;

use serde::{
use serde_core::{
Deserialize, Deserializer, Serialize, Serializer,
de::{self, Unexpected, Visitor},
};
Expand Down
6 changes: 3 additions & 3 deletions benzina/src/typed_uuid.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,15 +398,15 @@ macro_rules! __typed_uuid__impl_dangerous_construction {
#[cfg(feature = "serde")]
macro_rules! __typed_uuid__impl_serde {
($name:ident) => {
impl $crate::__private::serde::Serialize for $name {
impl $crate::__private::serde_core::Serialize for $name {
fn serialize<S>(
&self,
serializer: S,
) -> $crate::__private::std::result::Result<S::Ok, S::Error>
where
S: $crate::__private::serde::Serializer,
S: $crate::__private::serde_core::Serializer,
{
$crate::__private::serde::Serialize::serialize(&self.0, serializer)
$crate::__private::serde_core::Serialize::serialize(&self.0, serializer)
}
}
};
Expand Down