From eec145292c6fa9ad03d7c43fc2f63d9aa333eef4 Mon Sep 17 00:00:00 2001
From: atlas dostal <rodol@rivalrebels.com>
Date: Fri, 26 Jan 2024 22:04:46 -0800
Subject: [PATCH 1/3] Fix warnings in bevy_reflect

---
 crates/bevy_reflect/src/lib.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crates/bevy_reflect/src/lib.rs b/crates/bevy_reflect/src/lib.rs
index b415df7d69744..e3824cf1ff326 100644
--- a/crates/bevy_reflect/src/lib.rs
+++ b/crates/bevy_reflect/src/lib.rs
@@ -536,8 +536,6 @@ pub mod __macro_exports {
 #[allow(clippy::disallowed_types, clippy::approx_constant)]
 mod tests {
     use bevy_utils::HashMap;
-    #[rustfmt::skip] // This is used to avoid import conflicts with `super`
-    use ::glam::{quat, vec3, Quat, Vec3};
     use ron::{
         ser::{to_string_pretty, PrettyConfig},
         Deserializer,

From 5289742f947f6804e482472e5ab532b45fde03de Mon Sep 17 00:00:00 2001
From: atlas dostal <rodol@rivalrebels.com>
Date: Fri, 26 Jan 2024 22:08:13 -0800
Subject: [PATCH 2/3] Remove unused dep

---
 crates/bevy_reflect/Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml
index 8ba893218328c..4202293037d1b 100644
--- a/crates/bevy_reflect/Cargo.toml
+++ b/crates/bevy_reflect/Cargo.toml
@@ -36,7 +36,6 @@ glam = { version = "0.25", features = ["serde"], optional = true }
 smol_str = { version = "0.2.0", optional = true }
 
 [dev-dependencies]
-glam = { version = "0.25", features = ["serde"] }
 ron = "0.8.0"
 rmp-serde = "1.1"
 bincode = "1.3"

From d539e8ed37c6f1d4267eb1579e1c139ab98e3a22 Mon Sep 17 00:00:00 2001
From: atlas dostal <rodol@rivalrebels.com>
Date: Sat, 27 Jan 2024 09:20:50 -0800
Subject: [PATCH 3/3] Fix the fix

---
 crates/bevy_reflect/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/bevy_reflect/src/lib.rs b/crates/bevy_reflect/src/lib.rs
index e3824cf1ff326..f04622b58b1f9 100644
--- a/crates/bevy_reflect/src/lib.rs
+++ b/crates/bevy_reflect/src/lib.rs
@@ -535,13 +535,12 @@ pub mod __macro_exports {
 #[cfg(test)]
 #[allow(clippy::disallowed_types, clippy::approx_constant)]
 mod tests {
+    use ::serde::{de::DeserializeSeed, Deserialize, Serialize};
     use bevy_utils::HashMap;
     use ron::{
         ser::{to_string_pretty, PrettyConfig},
         Deserializer,
     };
-    #[rustfmt::skip] // This is used to avoid import conflicts with `super::`
-    use ::serde::{de::DeserializeSeed, Deserialize, Serialize};
     use std::{
         any::TypeId,
         borrow::Cow,
@@ -1994,6 +1993,7 @@ bevy_reflect::tests::Test {
     #[cfg(feature = "glam")]
     mod glam {
         use super::*;
+        use ::glam::{quat, vec3, Quat, Vec3};
 
         #[test]
         fn quat_serialization() {