Remove trait ToPlaintext and call to_owned on protected attributes in the Encryptable derive macro

Author: Nicklas Warming Jacobsen

cryptonamo-derive/src/encryptable.rs

@@ -36,7 +36,7 @@ pub(crate) fn derive_encryptable(input: DeriveInput) -> Result<TokenStream, syn:
             let attr_ident = format_ident!("{attr}");
 
             quote! {
-                .add_protected(#attr, |x| cryptonamo::traits::Plaintext::from(&x.#attr_ident))
+                .add_protected(#attr, |x| cryptonamo::traits::Plaintext::from(x.#attr_ident.to_owned()))
             }
         })
         .chain(plaintext_attributes.iter().map(|attr| {

src/traits/mod.rs

@@ -4,7 +4,7 @@ pub use cipherstash_client::encryption::{
     compound_indexer::{
         ComposableIndex, ComposablePlaintext, CompoundIndex, ExactIndex, PrefixIndex,
     },
-    Plaintext, PlaintextNullVariant, ToPlaintext, TryFromPlaintext,
+    Plaintext, PlaintextNullVariant, TryFromPlaintext,
 };
 
 mod primary_key;

vendor/cipherstash-client/src/encryption/mod.rs

@@ -27,7 +27,7 @@ use vitur_client::{EncryptPayload, EncryptedRecord};
 // Re-exports
 pub use self::{
     errors::{EncryptionError, TypeParseError},
-    plaintext::{Plaintext, PlaintextNullVariant, ToPlaintext, TryFromPlaintext},
+    plaintext::{Plaintext, PlaintextNullVariant, TryFromPlaintext},
 };
 
 pub struct Encryption<C: Credentials<Token = ViturToken> = ViturCredentials> {

vendor/cipherstash-client/src/encryption/plaintext/mod.rs

@@ -7,7 +7,6 @@ use zeroize::Zeroize;
 mod from_conversion;
 mod to_conversion;
 pub use from_conversion::TryFromPlaintext;
-pub use to_conversion::ToPlaintext;
 
 const VERSION: u8 = 1;
 

vendor/cipherstash-client/src/encryption/plaintext/to_conversion.rs

@@ -2,18 +2,12 @@ use super::{Plaintext, PlaintextNullVariant};
 use chrono::{DateTime, NaiveDate, Utc};
 use rust_decimal::Decimal;
 
-/// Trait for converting `Self` into `Plaintext`
-pub trait ToPlaintext: super::PlaintextNullVariant {
-    /// Converts `Self` into `Plaintext`
-    fn to_plaintext(self) -> Plaintext;
-}
-
 macro_rules! impl_from {
     ($($ty:ty => $variant:ident),*) => {
         $(
-            impl ToPlaintext for $ty {
-                fn to_plaintext(self) -> Plaintext {
-                    Plaintext::$variant(Some(self as _))
+            impl From<$ty> for Plaintext {
+                fn from(value: $ty) -> Self {
+                    Plaintext::$variant(Some(value as _))
                 }
             }
         )*
@@ -33,51 +27,25 @@ impl_from! {
     u64 => BigUInt
 }
 
-impl ToPlaintext for &str {
-    fn to_plaintext(self) -> Plaintext {
-        self.to_owned().to_plaintext()
-    }
-}
-
-/// Blanket implementation for all references
-/// where the referenced type is clonable and implements `ToPlaintext`.
-impl<T> ToPlaintext for &T
-where
-    T: ToPlaintext + Clone,
-    for<'r> &'r T: super::PlaintextNullVariant,
-{
-    fn to_plaintext(self) -> Plaintext {
-        self.clone().to_plaintext()
+impl From<&str> for Plaintext {
+    fn from(value: &str) -> Self {
+        Plaintext::Utf8Str(Some(value.to_owned()))
     }
 }
 
-/// Blanket implementation for `Option<T>` where
-/// `T` implements `ToPlaintext`.
-impl<T> ToPlaintext for Option<T>
+impl<T> From<Option<T>> for Plaintext
 where
-    T: ToPlaintext,
-    Option<T>: PlaintextNullVariant,
+    T: Into<Plaintext> + PlaintextNullVariant,
 {
-    fn to_plaintext(self) -> Plaintext {
-        if let Some(value) = self {
-            value.to_plaintext()
+    fn from(value: Option<T>) -> Self {
+        if let Some(value) = value {
+            value.into()
         } else {
-            Self::null()
+            T::null()
         }
     }
 }
 
-/// Blanket implementation of `From<T>` for all
-/// `T` that implements `ToPlaintext`
-impl<T> From<T> for Plaintext
-where
-    T: ToPlaintext,
-{
-    fn from(value: T) -> Self {
-        value.to_plaintext()
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;