From 77deac73f0bec11fb88653ac245f05de0cbdad84 Mon Sep 17 00:00:00 2001
From: Hulto <7121375+hulto@users.noreply.github.com>
Date: Wed, 19 Jun 2024 20:02:31 +0000
Subject: [PATCH 1/4] Fix impl

---
 implants/lib/eldritch/src/lib.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/implants/lib/eldritch/src/lib.rs b/implants/lib/eldritch/src/lib.rs
index e6a1c046b..2047c4528 100644
--- a/implants/lib/eldritch/src/lib.rs
+++ b/implants/lib/eldritch/src/lib.rs
@@ -85,15 +85,19 @@ macro_rules! eldritch_lib {
             Clone,
             Debug,
             PartialEq,
-            derive_more::Display,
             starlark::values::ProvidesStaticType,
             starlark::values::NoSerialize,
             allocative::Allocative,
         )]
-        #[display(fmt = stringify!($name))]
         pub struct $name;
         starlark::starlark_simple_value!($name);
 
+        impl std::fmt::Display for $name {
+            fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+                write!(f, "{}", stringify!($name))
+            }
+        }
+
         #[starlark_value(type = $t)]
         impl<'v> starlark::values::StarlarkValue<'v> for $name {
             fn get_methods() -> Option<&'static starlark::environment::Methods> {

From 7dbbc235c89c1a12b76e5f3f2af5007b67cb1f16 Mon Sep 17 00:00:00 2001
From: Hulto <7121375+hulto@users.noreply.github.com>
Date: Wed, 19 Jun 2024 20:09:02 +0000
Subject: [PATCH 2/4] Updated code gen

---
 implants/lib/pb/src/generated/c2.rs       | 1 -
 implants/lib/pb/src/generated/eldritch.rs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/implants/lib/pb/src/generated/c2.rs b/implants/lib/pb/src/generated/c2.rs
index c388d9b63..85563379b 100644
--- a/implants/lib/pb/src/generated/c2.rs
+++ b/implants/lib/pb/src/generated/c2.rs
@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 /// Agent information to identify the type of beacon.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
diff --git a/implants/lib/pb/src/generated/eldritch.rs b/implants/lib/pb/src/generated/eldritch.rs
index ac4647c34..6c7cac2b2 100644
--- a/implants/lib/pb/src/generated/eldritch.rs
+++ b/implants/lib/pb/src/generated/eldritch.rs
@@ -1,4 +1,3 @@
-// This file is @generated by prost-build.
 /// Tome for eldritch to execute.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]

From c630dce622b3b20d17e0df526d0f553b7ae5fb01 Mon Sep 17 00:00:00 2001
From: Hulto <7121375+hulto@users.noreply.github.com>
Date: Wed, 19 Jun 2024 20:18:16 +0000
Subject: [PATCH 3/4] DO NOT FUCKING CHANGE

---
 implants/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/implants/Cargo.toml b/implants/Cargo.toml
index 754915e08..77bf26846 100644
--- a/implants/Cargo.toml
+++ b/implants/Cargo.toml
@@ -18,7 +18,7 @@ base64 = "0.21.4"
 chrono = "0.4.34"
 clap = "3.2.23"
 default-net = "0.13.1"
-derive_more = "0.99.17"
+derive_more = "=0.99.17"
 eval = "0.4.3"
 flate2 = "1.0.24"
 gazebo = "0.8.1"

From dbbd68ab3a5dd68284d84228105982da746124c2 Mon Sep 17 00:00:00 2001
From: Hulto <7121375+hulto@users.noreply.github.com>
Date: Wed, 19 Jun 2024 20:30:32 +0000
Subject: [PATCH 4/4] Revert "Fix impl"

This reverts commit 77deac73f0bec11fb88653ac245f05de0cbdad84.
---
 implants/lib/eldritch/src/lib.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/implants/lib/eldritch/src/lib.rs b/implants/lib/eldritch/src/lib.rs
index 2047c4528..e6a1c046b 100644
--- a/implants/lib/eldritch/src/lib.rs
+++ b/implants/lib/eldritch/src/lib.rs
@@ -85,19 +85,15 @@ macro_rules! eldritch_lib {
             Clone,
             Debug,
             PartialEq,
+            derive_more::Display,
             starlark::values::ProvidesStaticType,
             starlark::values::NoSerialize,
             allocative::Allocative,
         )]
+        #[display(fmt = stringify!($name))]
         pub struct $name;
         starlark::starlark_simple_value!($name);
 
-        impl std::fmt::Display for $name {
-            fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
-                write!(f, "{}", stringify!($name))
-            }
-        }
-
         #[starlark_value(type = $t)]
         impl<'v> starlark::values::StarlarkValue<'v> for $name {
             fn get_methods() -> Option<&'static starlark::environment::Methods> {