Merge pull request #4 from thiolliere/gui-no-discard-error

Avoid discarding error when failing to parse a path
sam0x17 · Jun 5, 2023 · a143c92 · a143c92
2 parents 51561b9 + ac25c31
commit a143c92
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -689,9 +689,11 @@ pub fn import_tokens_attr_internal<T1: Into<TokenStream2>, T2: Into<TokenStream2
     attr: T1,
     tokens: T2,
 ) -> Result<TokenStream2> {
-    let mm_override_path = match parse2::<Path>(attr.into()) {
-        Ok(override_path) => override_path,
-        Err(_) => macro_magic_root(),
+    let attr = attr.into();
+    let mm_override_path = if attr.is_empty() {
+        macro_magic_root()
+    } else {
+        parse2::<Path>(attr)?
     };
     let mm_path = macro_magic_root();
     let mut proc_macro = parse_proc_macro_variant(tokens, ProcMacroType::Attribute)?;
@@ -797,9 +799,11 @@ pub fn import_tokens_proc_internal<T1: Into<TokenStream2>, T2: Into<TokenStream2
     attr: T1,
     tokens: T2,
 ) -> Result<TokenStream2> {
-    let mm_override_path = match parse2::<Path>(attr.into()) {
-        Ok(override_path) => override_path,
-        Err(_) => macro_magic_root(),
+    let attr = attr.into();
+    let mm_override_path = if attr.is_empty() {
+        macro_magic_root()
+    } else {
+        parse2::<Path>(attr)?
     };
     let mm_path = macro_magic_root();
     let proc_macro = parse_proc_macro_variant(tokens, ProcMacroType::Normal)?;