From 3c6d9deba3ffbb3929ffbab5f2bb73db30d0775f Mon Sep 17 00:00:00 2001
From: Hennadii Chernyshchyk <genaloner@gmail.com>
Date: Fri, 7 Oct 2022 20:57:57 +0300
Subject: [PATCH] Use default serde impls for Entity

---
 crates/bevy_ecs/Cargo.toml          |  2 +-
 crates/bevy_ecs/src/entity/mod.rs   |  5 ++--
 crates/bevy_ecs/src/entity/serde.rs | 44 -----------------------------
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 crates/bevy_ecs/src/entity/serde.rs

diff --git a/crates/bevy_ecs/Cargo.toml b/crates/bevy_ecs/Cargo.toml
index f08c82658b473..29769f6e45e62 100644
--- a/crates/bevy_ecs/Cargo.toml
+++ b/crates/bevy_ecs/Cargo.toml
@@ -26,7 +26,7 @@ thread_local = "1.1.4"
 fixedbitset = "0.4"
 fxhash = "0.2"
 downcast-rs = "1.2"
-serde = "1"
+serde = { version = "1", features = ["derive"] }
 
 [dev-dependencies]
 rand = "0.8"
diff --git a/crates/bevy_ecs/src/entity/mod.rs b/crates/bevy_ecs/src/entity/mod.rs
index 1c56e1b40e15b..6165d69e9c1eb 100644
--- a/crates/bevy_ecs/src/entity/mod.rs
+++ b/crates/bevy_ecs/src/entity/mod.rs
@@ -31,12 +31,11 @@
 //! [`EntityMut::insert`]: crate::world::EntityMut::insert
 //! [`EntityMut::remove`]: crate::world::EntityMut::remove
 mod map_entities;
-mod serde;
 
-pub use self::serde::*;
 pub use map_entities::*;
 
 use crate::{archetype::ArchetypeId, storage::SparseSetIndex};
+use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, fmt, mem, sync::atomic::Ordering};
 
 #[cfg(target_has_atomic = "64")]
@@ -104,7 +103,7 @@ type IdCursor = isize;
 /// [`EntityMut::id`]: crate::world::EntityMut::id
 /// [`EntityCommands`]: crate::system::EntityCommands
 /// [`Query::get`]: crate::system::Query::get
-#[derive(Clone, Copy, Hash, Eq, Ord, PartialEq, PartialOrd)]
+#[derive(Clone, Copy, Deserialize, Eq, Hash, Ord, PartialEq, PartialOrd, Serialize)]
 pub struct Entity {
     pub(crate) generation: u32,
     pub(crate) id: u32,
diff --git a/crates/bevy_ecs/src/entity/serde.rs b/crates/bevy_ecs/src/entity/serde.rs
deleted file mode 100644
index e9dbf03d1b2d5..0000000000000
--- a/crates/bevy_ecs/src/entity/serde.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use crate::entity::Entity;
-use serde::{de::Visitor, Deserialize, Serialize, Serializer};
-
-impl Serialize for Entity {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_u32(self.id())
-    }
-}
-
-impl<'de> Deserialize<'de> for Entity {
-    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-    where
-        D: serde::Deserializer<'de>,
-    {
-        deserializer.deserialize_u32(EntityVisitor)
-    }
-}
-
-struct EntityVisitor;
-
-impl<'de> Visitor<'de> for EntityVisitor {
-    type Value = Entity;
-
-    fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
-        formatter.write_str("Entity")
-    }
-
-    fn visit_u32<E>(self, v: u32) -> Result<Self::Value, E>
-    where
-        E: serde::de::Error,
-    {
-        Ok(Entity::from_raw(v))
-    }
-
-    fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
-    where
-        E: serde::de::Error,
-    {
-        Ok(Entity::from_raw(v as u32))
-    }
-}