From 730297cf561d42fd9132eb201d1aec0d3d7c7e00 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 26 Sep 2025 06:16:33 +0800 Subject: fix compile error with new serde version, and update deps --- azalea-chat/src/translatable_component.rs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'azalea-chat/src/translatable_component.rs') diff --git a/azalea-chat/src/translatable_component.rs b/azalea-chat/src/translatable_component.rs index 28700366..b8e93245 100644 --- a/azalea-chat/src/translatable_component.rs +++ b/azalea-chat/src/translatable_component.rs @@ -1,6 +1,6 @@ use std::fmt::{self, Display}; -use serde::{__private::ser::FlatMapSerializer, Serialize, Serializer, ser::SerializeMap}; +use serde::Serialize; #[cfg(feature = "simdnbt")] use simdnbt::Serialize as _; @@ -24,27 +24,18 @@ impl simdnbt::ToNbtTag for StringOrComponent { } /// A message whose content depends on the client's language. -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Serialize)] pub struct TranslatableComponent { + #[serde(flatten)] pub base: BaseComponent, + #[serde(rename = "translate")] pub key: String, + #[serde(skip_serializing_if = "Option::is_none")] pub fallback: Option, + #[serde(rename = "with")] pub args: Vec, } -impl Serialize for TranslatableComponent { - fn serialize(&self, serializer: S) -> Result - where - S: Serializer, - { - let mut state = serializer.serialize_map(None)?; - state.serialize_entry("translate", &self.key)?; - Serialize::serialize(&self.base, FlatMapSerializer(&mut state))?; - state.serialize_entry("with", &self.args)?; - state.end() - } -} - #[cfg(feature = "simdnbt")] fn serialize_args_as_nbt(args: &[StringOrComponent]) -> simdnbt::owned::NbtList { // if it's all strings then make it a string list -- cgit v1.2.3