use serde_variant again

Electron100 · Apr 6, 2024 · 79b24cc · 79b24cc
1 parent 481fb6f
commit 79b24cc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/butane_codegen/Cargo.toml b/butane_codegen/Cargo.toml
@@ -17,6 +17,7 @@ uuid = ["butane_core/uuid"]
 butane_core = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
+serde_variant = "0.1.3"
 syn = { workspace = true }
 
 [lib]

diff --git a/butane_codegen/src/lib.rs b/butane_codegen/src/lib.rs
@@ -268,7 +268,7 @@ pub fn derive_field_type(input: TokenStream) -> TokenStream {
 }
 
 fn derive_field_type_for_newtype(ident: &Ident, sqltype: SqlType) -> TokenStream {
-    let sqltype_name: &'static str = sqltype.clone().into();
+    let sqltype_name = serde_variant::to_variant_name(&sqltype).unwrap();
     let sqltype_ident = syn::Ident::new(sqltype_name, proc_macro2::Span::call_site());
 
     let mut migrations = migrations_for_dir();

diff --git a/butane_core/Cargo.toml b/butane_core/Cargo.toml
@@ -45,7 +45,6 @@ regex = { version = "1.5", features = ["std"] }
 rusqlite = { workspace = true, optional = true }
 serde = { features = ["derive"], workspace = true }
 serde_json = { workspace = true }
-strum = { version = "0.26", features = ["derive"] }
 sqlparser = { workspace = true }
 syn = { workspace = true }
 thiserror = "1.0"

diff --git a/butane_core/src/lib.rs b/butane_core/src/lib.rs
@@ -268,7 +268,7 @@ impl From<rusqlite::types::FromSqlError> for Error {
 /// Enumeration of the types a database value may take.
 ///
 /// See also [`SqlVal`].
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize, strum::IntoStaticStr)]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub enum SqlType {
     /// Boolean
     Bool,