macros

Signed-off-by: Shaobo He <[email protected]>
cedar-policy · Dec 3, 2024 · a171b91 · a171b91
1 parent 825f41f
commit a171b91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/cedar-policy-core/src/error_macros.rs b/cedar-policy-core/src/error_macros.rs
@@ -37,15 +37,15 @@ macro_rules! impl_diagnostic_from_source_loc_field {
 /// of a field of type `Option<Loc>`
 #[macro_export]
 macro_rules! impl_diagnostic_from_source_loc_opt_field {
-    ( $i:ident ) => {
+    ( $($id:ident).+ ) => {
         fn source_code(&self) -> Option<&dyn miette::SourceCode> {
-            self.$i
+            self.$($id).+
                 .as_ref()
                 .map(|loc| &loc.src as &dyn miette::SourceCode)
         }
 
         fn labels(&self) -> Option<Box<dyn Iterator<Item = miette::LabeledSpan> + '_>> {
-            self.$i
+            self.$($id).+
                 .as_ref()
                 .map(|loc| Box::new(std::iter::once(miette::LabeledSpan::underline(loc.span))) as _)
         }

diff --git a/cedar-policy-core/src/parser/err.rs b/cedar-policy-core/src/parser/err.rs
@@ -487,16 +487,7 @@ pub mod parse_errors {
             ))
         }
 
-        fn labels(&self) -> Option<Box<dyn Iterator<Item = miette::LabeledSpan> + '_>> {
-            self.slot.loc.as_ref().map(|loc| {
-                let label = miette::LabeledSpan::underline(loc.span);
-                Box::new(std::iter::once(label)) as Box<dyn Iterator<Item = miette::LabeledSpan>>
-            })
-        }
-
-        fn source_code(&self) -> Option<&dyn miette::SourceCode> {
-            self.slot.loc.as_ref().map(|l| l as &dyn miette::SourceCode)
-        }
+        impl_diagnostic_from_source_loc_opt_field!(slot.loc);
     }
 
     impl From<ast::UnexpectedSlotError> for ExpectedStaticPolicy {