From f456e0755937a75bcc62f366bb1149c51100046e Mon Sep 17 00:00:00 2001 From: Joe Ardent Date: Tue, 13 Jun 2023 22:08:28 -0700 Subject: [PATCH] make derive not do a trait --- optional_optional_user/src/lib.rs | 2 +- src/templates.rs | 4 ---- src/watches/templates.rs | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/optional_optional_user/src/lib.rs b/optional_optional_user/src/lib.rs index 56cb9cc..e8d036b 100644 --- a/optional_optional_user/src/lib.rs +++ b/optional_optional_user/src/lib.rs @@ -28,7 +28,7 @@ pub fn derive_optional_optional_user(input: TokenStream) -> TokenStream { }; let output = quote!( - impl crate::templates::OptionalOptionalUser for #name { + impl #name { fn has_optional_user(&self) -> bool { use ::std::any::Any; #has_user #user_is_option_user diff --git a/src/templates.rs b/src/templates.rs index 6128caf..aea0a2a 100644 --- a/src/templates.rs +++ b/src/templates.rs @@ -4,10 +4,6 @@ use serde::{Deserialize, Serialize}; use crate::User; -pub trait OptionalOptionalUser { - fn has_optional_user(&self) -> bool; -} - #[derive(Debug, Default, Template, Deserialize, Serialize, PartialEq, Eq, OptionalOptionalUser)] #[template(path = "signup.html")] pub struct CreateUser { diff --git a/src/watches/templates.rs b/src/watches/templates.rs index 10a62fb..3e913f2 100644 --- a/src/watches/templates.rs +++ b/src/watches/templates.rs @@ -2,7 +2,7 @@ use askama::Template; use optional_optional_user::OptionalOptionalUser; use serde::{Deserialize, Serialize}; -use crate::{templates::OptionalOptionalUser, User, Watch}; +use crate::{User, Watch}; #[derive(Debug, Default, Template, Deserialize, Serialize, PartialEq, Eq, OptionalOptionalUser)] #[template(path = "get_watches.html")]