Apply suggestions from code review

Co-authored-by: Craig Disselkoen <[email protected]>
cedar-policy · Dec 7, 2023 · b760271 · b760271
1 parent 32bf33f
commit b760271
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cedar-policy-core/src/parser/cst_to_ast.rs b/cedar-policy-core/src/parser/cst_to_ast.rs
@@ -3817,9 +3817,8 @@ mod tests {
             assert!(
                 errs.iter()
                     .any(|err| { matches!(err, ParseError::ToAST(err) if err.kind() == &em) }),
-                "Expected to find error `{:?}`, but saw `{:?}`",
-                em,
-                errs
+                "Expected to find error `{em:?}`, but saw `{}`",
+                errs.pretty_with_helps(),
             );
         }
     }

diff --git a/cedar-policy-core/src/parser/err.rs b/cedar-policy-core/src/parser/err.rs
@@ -92,7 +92,7 @@ pub enum ParseLiteralError {
 
 /// Errors in the CST -> AST transform, mostly well-formedness issues.
 #[derive(Debug, Error, Clone, PartialEq, Eq)]
-#[error("{}", .kind)]
+#[error("{kind}")]
 pub struct ToASTError {
     kind: ToASTErrorKind,
     source_info: SourceInfo,

diff --git a/cedar-policy-core/src/parser/node.rs b/cedar-policy-core/src/parser/node.rs
@@ -311,6 +311,6 @@ impl<N> ASTNode<Option<N>> {
     pub fn ok_or_missing(&self) -> Result<&N, ToASTError> {
         self.node
             .as_ref()
-            .ok_or_else(|| ToASTError::new(ToASTErrorKind::MissingNodeData, self.info.clone()))
+            .ok_or_else(|| self.to_ast_err(ToASTErrorKind::MissingNodeData))
     }
 }