From 5969fc725ec49c1cce6337660e9d0e512362d429 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 15:49:35 +0300 Subject: [PATCH] Bump serde from 1.0.180 to 1.0.183 in /lang/rust (#2424) * Bump serde from 1.0.180 to 1.0.183 in /lang/rust Bumps [serde](https://github.com/serde-rs/serde) from 1.0.180 to 1.0.183. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.180...v1.0.183) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Update the Serde impl after https://github.com/serde-rs/serde/pull/2505 Also see https://github.com/serde-rs/serde/issues/2496 Signed-off-by: Martin Tzvetanov Grigorov --------- Signed-off-by: dependabot[bot] Signed-off-by: Martin Tzvetanov Grigorov Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Martin Tzvetanov Grigorov (cherry picked from commit e26943fd1ecf046d5232df1f3c26458f36e8488f) --- lang/rust/Cargo.lock | 8 ++++---- lang/rust/avro/Cargo.toml | 2 +- lang/rust/avro/src/de.rs | 1 + lang/rust/avro/src/ser.rs | 6 +++--- lang/rust/avro_derive/Cargo.toml | 2 +- lang/rust/wasm-demo/Cargo.toml | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lang/rust/Cargo.lock b/lang/rust/Cargo.lock index da9c75cdaa2..fdf60bb365f 100644 --- a/lang/rust/Cargo.lock +++ b/lang/rust/Cargo.lock @@ -951,18 +951,18 @@ checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" [[package]] name = "serde" -version = "1.0.180" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.180" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", diff --git a/lang/rust/avro/Cargo.toml b/lang/rust/avro/Cargo.toml index 057d7536906..df7cb4cc769 100644 --- a/lang/rust/avro/Cargo.toml +++ b/lang/rust/avro/Cargo.toml @@ -64,7 +64,7 @@ libflate = { default-features = false, version = "2.0.0", features = ["std"] } log = { default-features = false, version = "0.4.20" } num-bigint = { default-features = false, version = "0.4.3" } regex = { default-features = false, version = "1.9.3", features = ["std", "perf"] } -serde = { default-features = false, version = "1.0.180", features = ["derive"] } +serde = { default-features = false, version = "1.0.183", features = ["derive"] } serde_json = { default-features = false, version = "1.0.104", features = ["std"] } snap = { default-features = false, version = "1.1.0", optional = true } strum = { default-features = false, version = "0.25.0" } diff --git a/lang/rust/avro/src/de.rs b/lang/rust/avro/src/de.rs index a2e7a0e52bd..610b15ae597 100644 --- a/lang/rust/avro/src/de.rs +++ b/lang/rust/avro/src/de.rs @@ -515,6 +515,7 @@ impl<'a, 'de> de::Deserializer<'de> for &'a Deserializer<'de> { match *self.input { // This branch can be anything... Value::Record(ref fields) => visitor.visit_enum(EnumDeserializer::new(fields)), + Value::String(ref field) => visitor.visit_enum(EnumUnitDeserializer::new(field)), // This has to be a unit Enum Value::Enum(_index, ref field) => visitor.visit_enum(EnumUnitDeserializer::new(field)), _ => Err(de::Error::custom(format!( diff --git a/lang/rust/avro/src/ser.rs b/lang/rust/avro/src/ser.rs index 0556dc28e98..f79e0586682 100644 --- a/lang/rust/avro/src/ser.rs +++ b/lang/rust/avro/src/ser.rs @@ -200,10 +200,10 @@ impl<'b> ser::Serializer for &'b mut Serializer { fn serialize_unit_variant( self, _: &'static str, - index: u32, + _variant_index: u32, variant: &'static str, ) -> Result { - Ok(Value::Enum(index, variant.to_string())) + Ok(Value::String(variant.to_string())) } fn serialize_newtype_struct( @@ -720,7 +720,7 @@ mod tests { a: UnitExternalEnum::Val1, }; - let expected = Value::Record(vec![("a".to_owned(), Value::Enum(0, "Val1".to_owned()))]); + let expected = Value::Record(vec![("a".to_owned(), Value::String("Val1".to_owned()))]); assert_eq!( to_value(test)?, diff --git a/lang/rust/avro_derive/Cargo.toml b/lang/rust/avro_derive/Cargo.toml index 37f79362e88..f874901f69e 100644 --- a/lang/rust/avro_derive/Cargo.toml +++ b/lang/rust/avro_derive/Cargo.toml @@ -42,4 +42,4 @@ syn = { default-features = false, version = "2.0.28", features = ["full", "fold" [dev-dependencies] apache-avro = { default-features = false, path = "../avro", features = ["derive"] } proptest = { default-features = false, version = "1.2.0", features = ["std"] } -serde = { default-features = false, version = "1.0.180", features = ["derive"] } +serde = { default-features = false, version = "1.0.183", features = ["derive"] } diff --git a/lang/rust/wasm-demo/Cargo.toml b/lang/rust/wasm-demo/Cargo.toml index c8d395cea70..62ac5ee237e 100644 --- a/lang/rust/wasm-demo/Cargo.toml +++ b/lang/rust/wasm-demo/Cargo.toml @@ -36,7 +36,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] apache-avro = { path = "../avro" } -serde = { default-features = false, version = "1.0.180", features = ["derive"] } +serde = { default-features = false, version = "1.0.183", features = ["derive"] } wasm-bindgen = "0.2.87" [dev-dependencies]