From 9336bdd0cf5cccb044b9c718bbc44341383acebf Mon Sep 17 00:00:00 2001 From: Zhixing Zhang Date: Sun, 10 Sep 2023 23:30:19 -0700 Subject: [PATCH 1/4] Fix AssetPath serialization issue --- crates/bevy_asset/src/path.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/bevy_asset/src/path.rs b/crates/bevy_asset/src/path.rs index 9c0111006e73a..b1c9b6127ab8c 100644 --- a/crates/bevy_asset/src/path.rs +++ b/crates/bevy_asset/src/path.rs @@ -231,10 +231,7 @@ impl<'a> Serialize for AssetPath<'a> { where S: serde::Serializer, { - let mut state = serializer.serialize_tuple_struct("AssetPath", 1)?; - let string = self.to_string(); - state.serialize_field(&string)?; - state.end() + self.to_string().serialize(serializer) } } @@ -243,7 +240,7 @@ impl<'de> Deserialize<'de> for AssetPath<'static> { where D: serde::Deserializer<'de>, { - deserializer.deserialize_tuple_struct("AssetPath", 1, AssetPathVisitor) + deserializer.deserialize_string(AssetPathVisitor) } } From 578c7803dfc56ebe85dcb0b5eca46fcb5f259541 Mon Sep 17 00:00:00 2001 From: Zhixing Zhang Date: Sun, 10 Sep 2023 23:30:36 -0700 Subject: [PATCH 2/4] Silence StrongHandle SendError on drop --- crates/bevy_asset/src/handle.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crates/bevy_asset/src/handle.rs b/crates/bevy_asset/src/handle.rs index 81de4456b4a78..5720b7479fe90 100644 --- a/crates/bevy_asset/src/handle.rs +++ b/crates/bevy_asset/src/handle.rs @@ -93,12 +93,10 @@ pub struct StrongHandle { impl Drop for StrongHandle { fn drop(&mut self) { - if let Err(err) = self.drop_sender.send(DropEvent { + let _ = self.drop_sender.send(DropEvent { id: self.id.internal(), asset_server_managed: self.asset_server_managed, - }) { - println!("Failed to send DropEvent for StrongHandle {:?}", err); - } + }); } } From 5591db3262420ad2a5849ae347e88702aaa9ad20 Mon Sep 17 00:00:00 2001 From: Zhixing Zhang Date: Sun, 10 Sep 2023 23:50:05 -0700 Subject: [PATCH 3/4] cargo fix --- crates/bevy_asset/src/path.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/bevy_asset/src/path.rs b/crates/bevy_asset/src/path.rs index b1c9b6127ab8c..db64a6481dc60 100644 --- a/crates/bevy_asset/src/path.rs +++ b/crates/bevy_asset/src/path.rs @@ -1,6 +1,6 @@ use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize}; use bevy_utils::CowArc; -use serde::{de::Visitor, ser::SerializeTupleStruct, Deserialize, Serialize}; +use serde::{de::Visitor, Deserialize, Serialize}; use std::{ fmt::{Debug, Display}, hash::Hash, From 0e056e320d3264a05dd8184641b650f1909ac26c Mon Sep 17 00:00:00 2001 From: Zhixing Zhang Date: Mon, 11 Sep 2023 22:53:49 -0700 Subject: [PATCH 4/4] export BoxedFuture --- crates/bevy_asset/src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs index c46588ffe2b40..0dc9d0589b63e 100644 --- a/crates/bevy_asset/src/lib.rs +++ b/crates/bevy_asset/src/lib.rs @@ -34,6 +34,7 @@ pub use reflect::*; pub use server::*; pub use anyhow; +pub use bevy_utils::BoxedFuture; use crate::{ io::{processor_gated::ProcessorGatedReader, AssetProvider, AssetProviders},