✨ Minor fixes && Version bump

Author: nwrenger

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flip-ui"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 authors = ["Nils Wrenger <nils@wrenger.net>"]
 description = "Rust integration for handling and compiling the UI built via the UI Flip UI Builder"
@@ -19,7 +19,7 @@ targets = []
 harness = false
 
 [dependencies]
-flip-ui-macro = { path = "macro", version = "0.1.2" }
+flip-ui-macro = { path = "macro", version = "0.1.3" }
 flipperzero = { git = "https://github.com/flipperzero-rs/flipperzero", version = "0.11.0" }
 
 [dev-dependencies]

README.md

@@ -18,7 +18,7 @@ Add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-flip_ui = "0.1.1"
+flip_ui = "0.1.3"
 ```
 
 ## Example

macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flip-ui-macro"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2021"
 description = "Procedural macros for flip-ui"
 rust-version = "1.70.0"
@@ -17,4 +17,3 @@ serde_json = "1.0"
 quote = "1.0"
 syn = { version = "2.0.62", features = ["full"] }
 proc-macro2 = "1.0"
-proc-macro-error = "1.0.4"

macro/src/lib.rs

@@ -4,11 +4,14 @@ use std::{ffi::CString, fmt, fs};
 
 use proc_macro as pc;
 use proc_macro2::{Span, TokenStream};
-use proc_macro_error::{abort, proc_macro_error};
 use quote::{quote, ToTokens};
 use serde::Deserialize;
 use syn::{parse::Parse, spanned::Spanned};
 
+fn s_err(span: proc_macro2::Span, msg: impl fmt::Display) -> syn::Error {
+    syn::Error::new(span, msg)
+}
+
 /// Creates the App struct with the running logic
 ///
 /// ## Helper Functions
@@ -28,7 +31,6 @@ use syn::{parse::Parse, spanned::Spanned};
 ///     none => none,
 /// }
 /// ```
-#[proc_macro_error]
 #[proc_macro]
 pub fn flip_ui(input: pc::TokenStream) -> pc::TokenStream {
     match flip_ui_inner(input.into()) {
@@ -105,7 +107,10 @@ fn flip_ui_inner(input: TokenStream) -> syn::Result<TokenStream> {
 
         // Check if there are unused handler
         if !used {
-            abort!(ident.span(), format!("Unused handler function: {}", name));
+            return Err(s_err(
+                ident.span(),
+                format!("Unused handler function: {}", name),
+            ));
         } else {
             used_handlers.push(name.clone());
         }
@@ -114,13 +119,13 @@ fn flip_ui_inner(input: TokenStream) -> syn::Result<TokenStream> {
     // Finally check if all functions could be satisfied
     for function in functions {
         if !used_handlers.contains(function) {
-            abort!(
+            return Err(s_err(
                 Span::call_site(),
                 format!(
                     "Specified function '{}' does not have a corresponding handler.",
                     function
-                )
-            );
+                ),
+            ));
         }
     }
 
@@ -209,10 +214,6 @@ impl Parse for Args {
     }
 }
 
-fn s_err(span: proc_macro2::Span, msg: impl fmt::Display) -> syn::Error {
-    syn::Error::new(span, msg)
-}
-
 #[derive(Deserialize)]
 struct Data {
     views: Vec<View>,