This is an automated email from the ASF dual-hosted git repository. kriskras99 pushed a commit to branch feat/serde_flatten in repository https://gitbox.apache.org/repos/asf/avro-rs.git
commit b4924c0a255d6f55a4a65fc31f06d31ed8ff5ff8 Author: Kriskras99 <[email protected]> AuthorDate: Sun Dec 7 22:08:59 2025 +0100 chore: Move all Serde related modules to the `serde` module --- avro/src/lib.rs | 7 ++----- avro/src/{ => serde}/de.rs | 0 avro/src/serde/mod.rs | 3 +++ avro/src/{ => serde}/ser.rs | 0 avro/src/{ => serde}/ser_schema.rs | 0 avro/src/types.rs | 6 +++--- avro/src/writer.rs | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/avro/src/lib.rs b/avro/src/lib.rs index 853722d..f75c5a3 100644 --- a/avro/src/lib.rs +++ b/avro/src/lib.rs @@ -945,14 +945,12 @@ mod bigdecimal; mod bytes; mod codec; -mod de; mod decimal; mod decode; mod duration; mod encode; mod reader; -mod ser; -mod ser_schema; +mod serde; mod writer; pub mod error; @@ -979,7 +977,6 @@ pub use codec::xz::XzSettings; #[cfg(feature = "zstandard")] pub use codec::zstandard::ZstandardSettings; pub use codec::{Codec, DeflateSettings}; -pub use de::from_value; pub use decimal::Decimal; pub use duration::{Days, Duration, Millis, Months}; pub use error::Error; @@ -988,7 +985,7 @@ pub use reader::{ from_avro_datum_reader_schemata, from_avro_datum_schemata, read_marker, }; pub use schema::{AvroSchema, Schema}; -pub use ser::to_value; +pub use serde::{de::from_value, ser::to_value}; pub use uuid::Uuid; pub use writer::{ GenericSingleObjectWriter, SpecificSingleObjectWriter, Writer, WriterBuilder, to_avro_datum, diff --git a/avro/src/de.rs b/avro/src/serde/de.rs similarity index 100% rename from avro/src/de.rs rename to avro/src/serde/de.rs diff --git a/avro/src/serde/mod.rs b/avro/src/serde/mod.rs new file mode 100644 index 0000000..67bd005 --- /dev/null +++ b/avro/src/serde/mod.rs @@ -0,0 +1,3 @@ +pub mod de; +pub mod ser; +pub mod ser_schema; diff --git a/avro/src/ser.rs b/avro/src/serde/ser.rs similarity index 100% rename from avro/src/ser.rs rename to avro/src/serde/ser.rs diff --git a/avro/src/ser_schema.rs b/avro/src/serde/ser_schema.rs similarity index 100% rename from avro/src/ser_schema.rs rename to avro/src/serde/ser_schema.rs diff --git a/avro/src/types.rs b/avro/src/types.rs index 4448eef..5a54c3f 100644 --- a/avro/src/types.rs +++ b/avro/src/types.rs @@ -2701,7 +2701,7 @@ Field with name '"b"' is not a member of the map items"#, #[test] fn test_avro_3460_validation_with_refs_real_struct() -> TestResult { - use crate::ser::Serializer; + use crate::serde::ser::Serializer; use serde::Serialize; #[derive(Serialize, Clone)] @@ -2790,7 +2790,7 @@ Field with name '"b"' is not a member of the map items"#, } fn avro_3674_with_or_without_namespace(with_namespace: bool) -> TestResult { - use crate::ser::Serializer; + use crate::serde::ser::Serializer; use serde::Serialize; let schema_str = r#" @@ -2883,7 +2883,7 @@ Field with name '"b"' is not a member of the map items"#, } fn avro_3688_schema_resolution_panic(set_field_b: bool) -> TestResult { - use crate::ser::Serializer; + use crate::serde::ser::Serializer; use serde::{Deserialize, Serialize}; let schema_str = r#"{ diff --git a/avro/src/writer.rs b/avro/src/writer.rs index 31fb5c7..29055f0 100644 --- a/avro/src/writer.rs +++ b/avro/src/writer.rs @@ -22,7 +22,7 @@ use crate::{ error::Details, headers::{HeaderBuilder, RabinFingerprintHeader}, schema::{AvroSchema, Name, ResolvedOwnedSchema, ResolvedSchema, Schema}, - ser_schema::SchemaAwareWriteSerializer, + serde::ser_schema::SchemaAwareWriteSerializer, types::Value, }; use serde::Serialize;
