From 15177a529a5bd8f0aaff45a625c8bc10e8f3f00e Mon Sep 17 00:00:00 2001 From: Joscha Date: Thu, 27 Apr 2023 20:36:00 +0200 Subject: [PATCH] Clean up macro code a bit --- cove-macro/src/document.rs | 4 ++-- cove-macro/src/group.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cove-macro/src/document.rs b/cove-macro/src/document.rs index 75a0cfc..cf75553 100644 --- a/cove-macro/src/document.rs +++ b/cove-macro/src/document.rs @@ -3,7 +3,7 @@ use quote::quote; use syn::spanned::Spanned; use syn::{Data, DataEnum, DataStruct, DeriveInput, ExprPath, Field, Ident, LitStr, Type}; -use crate::util::{self, docstring}; +use crate::util; enum SerdeDefault { Default(Type), @@ -21,7 +21,7 @@ struct FieldInfo { impl FieldInfo { fn initialize_from_field(&mut self, field: &Field) -> syn::Result<()> { - let docstring = docstring(field)?; + let docstring = util::docstring(field)?; if !docstring.is_empty() { self.description = Some(docstring); } diff --git a/cove-macro/src/group.rs b/cove-macro/src/group.rs index f273ad8..1864774 100644 --- a/cove-macro/src/group.rs +++ b/cove-macro/src/group.rs @@ -17,7 +17,7 @@ fn decapitalize(s: &str) -> String { pub fn derive_impl(input: DeriveInput) -> syn::Result { let Data::Struct(data) = input.data else { - return Err(syn::Error::new(input.span(), "Must be a struct")); + return util::bail(input.span(), "Must be a struct"); }; let struct_ident = input.ident;