update to thiserror 2 (#1312)

Signed-off-by: Craig Disselkoen <[email protected]>

Author: cdisselkoen

Cargo.lock

@@ -17,7 +17,7 @@ clap = { version = "4", features = ["derive", "env"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 miette = { version = "7.1.0", features = ["fancy"] }
-thiserror = "1.0"
+thiserror = "2.0"
 semver = "1.0.23"
 
 [features]

cedar-policy-cli/Cargo.toml

@@ -22,7 +22,7 @@ either = "1.8"
 itertools = "0.13"
 ref-cast = "1.0"
 rustc_lexer = "0.1"
-thiserror = "1.0"
+thiserror = "2.0"
 smol_str = { version = "0.3", features = ["serde"] }
 stacker = "0.1.15"
 arbitrary = { version = "1", features = ["derive"], optional = true }

cedar-policy-core/Cargo.toml

@@ -303,7 +303,7 @@ impl std::fmt::Display for Template {
 pub enum LinkingError {
     /// An error with the slot arguments provided
     // INVARIANT: `unbound_values` and `extra_values` can't both be empty
-    #[error("{}", describe_arity_error(.unbound_values, .extra_values))]
+    #[error(fmt = describe_arity_error)]
     ArityError {
         /// Error for when some Slots were not provided values
         unbound_values: Vec<SlotId>,
@@ -338,14 +338,18 @@ impl LinkingError {
     }
 }
 
-fn describe_arity_error(unbound_values: &[SlotId], extra_values: &[SlotId]) -> String {
+fn describe_arity_error(
+    unbound_values: &[SlotId],
+    extra_values: &[SlotId],
+    fmt: &mut std::fmt::Formatter<'_>,
+) -> std::fmt::Result {
     match (unbound_values.len(), extra_values.len()) {
         // PANIC SAFETY 0,0 case is not an error
         #[allow(clippy::unreachable)]
         (0,0) => unreachable!(),
-        (_unbound, 0) => format!("the following slots were not provided as arguments: {}", unbound_values.iter().join(",")),
-        (0, _extra) => format!("the following slots were provided as arguments, but did not exist in the template: {}", extra_values.iter().join(",")),
-        (_unbound, _extra) => format!("the following slots were not provided as arguments: {}. The following slots were provided as arguments, but did not exist in the template: {}", unbound_values.iter().join(","), extra_values.iter().join(","))
+        (_unbound, 0) => write!(fmt, "the following slots were not provided as arguments: {}", unbound_values.iter().join(",")),
+        (0, _extra) => write!(fmt, "the following slots were provided as arguments, but did not exist in the template: {}", extra_values.iter().join(",")),
+        (_unbound, _extra) => write!(fmt, "the following slots were not provided as arguments: {}. The following slots were provided as arguments, but did not exist in the template: {}", unbound_values.iter().join(","), extra_values.iter().join(",")),
     }
 }
 

cedar-policy-core/src/ast/policy.rs

@@ -1436,7 +1436,10 @@ impl TryFrom<&Node<Option<cst::Member>>> for Expr {
                     item = match item {
                         Either::Left(name) => {
                             return Err(node
-                                .to_ast_err(ToASTErrorKind::InvalidAccess(name, id.to_smolstr()))
+                                .to_ast_err(ToASTErrorKind::InvalidAccess {
+                                    lhs: name,
+                                    field: id.to_smolstr(),
+                                })
                                 .into())
                         }
                         Either::Right(expr) => Either::Right(Expr::get_attr(expr, id.to_smolstr())),
@@ -1505,7 +1508,10 @@ impl TryFrom<&Node<Option<cst::Member>>> for Expr {
                     item = match item {
                         Either::Left(name) => {
                             return Err(node
-                                .to_ast_err(ToASTErrorKind::InvalidIndex(name, s))
+                                .to_ast_err(ToASTErrorKind::InvalidIndex {
+                                    lhs: name,
+                                    field: s,
+                                })
                                 .into())
                         }
                         Either::Right(expr) => Either::Right(Expr::get_attr(expr, s)),

cedar-policy-core/src/est/expr.rs

@@ -1274,16 +1274,19 @@ impl Node<Option<cst::Member>> {
                 // attribute access on an arbitrary name - error
                 (Name { name, .. }, [Field(f), ..]) => {
                     return Err(self
-                        .to_ast_err(ToASTErrorKind::InvalidAccess(
-                            name.clone(),
-                            f.to_string().into(),
-                        ))
+                        .to_ast_err(ToASTErrorKind::InvalidAccess {
+                            lhs: name.clone(),
+                            field: f.to_smolstr(),
+                        })
                         .into());
                 }
                 // index style attribute access on an arbitrary name - error
                 (Name { name, .. }, [Index(i), ..]) => {
                     return Err(self
-                        .to_ast_err(ToASTErrorKind::InvalidIndex(name.clone(), i.clone()))
+                        .to_ast_err(ToASTErrorKind::InvalidIndex {
+                            lhs: name.clone(),
+                            field: i.clone(),
+                        })
                         .into());
                 }
 

cedar-policy-core/src/parser/cst_to_ast.rs

@@ -323,11 +323,21 @@ pub enum ToASTErrorKind {
     #[error("function calls must be of the form `<name>(arg1, arg2, ...)`")]
     ExpressionCall,
     /// Returned when a policy attempts to access the fields of a value with no fields
-    #[error("invalid member access `{0}.{1}`, `{0}` has no fields or methods")]
-    InvalidAccess(ast::Name, SmolStr),
+    #[error("invalid member access `{lhs}.{field}`, `{lhs}` has no fields or methods")]
+    InvalidAccess {
+        /// what we attempted to access a field of
+        lhs: ast::Name,
+        /// field we attempted to access
+        field: SmolStr,
+    },
     /// Returned when a policy attempts to index on a fields of a value with no fields
-    #[error("invalid indexing expression `{0}[\"{}\"]`, `{0}` has no fields", .1.escape_debug())]
-    InvalidIndex(ast::Name, SmolStr),
+    #[error("invalid indexing expression `{lhs}[\"{}\"]`, `{lhs}` has no fields", .field.escape_debug())]
+    InvalidIndex {
+        /// what we attempted to access a field of
+        lhs: ast::Name,
+        /// field we attempted to access
+        field: SmolStr,
+    },
     /// Returned when the contents of an indexing expression is not a string literal
     #[error("the contents of an index expression must be a string literal")]
     NonStringIndex,

cedar-policy-core/src/parser/err.rs

@@ -16,7 +16,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"] }
 serde_with = "3.0"
 miette = "7.1.0"
-thiserror = "1.0"
+thiserror = "2.0"
 itertools = "0.13"
 ref-cast = "1.0"
 unicode-security = "0.1.0"

cedar-policy-validator/Cargo.toml

@@ -20,7 +20,7 @@ serde_json = "1.0"
 lalrpop-util = { version = "0.22.0", features = ["lexer"] }
 itertools = "0.13"
 miette = "7.1.0"
-thiserror = "1.0"
+thiserror = "2.0"
 smol_str = { version = "0.3", features = ["serde"] }
 dhat = { version = "0.3.2", optional = true }
 serde_with = "3.3.0"