Fix arbitrary impl

Signed-off-by: John Kastner <[email protected]>

Author: john-h-kastner-aws

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

@@ -64,7 +64,6 @@ impl std::fmt::Display for EntityType {
 
 /// Unique ID for an entity. These represent entities in the AST.
 #[derive(Serialize, Deserialize, Debug, Clone)]
-#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub struct EntityUID {
     /// Typename of the entity
     ty: EntityType,
@@ -216,6 +215,17 @@ impl FromNormalizedStr for EntityUID {
     }
 }
 
+#[cfg(feature = "arbitrary")]
+impl<'a> arbitrary::Arbitrary<'a> for EntityUID {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+        Ok(Self {
+            ty: u.arbitrary()?,
+            eid: u.arbitrary()?,
+            loc: None,
+        })
+    }
+}
+
 /// EID type is just a SmolStr for now
 #[derive(Serialize, Deserialize, PartialEq, Eq, Debug, Clone, Hash, PartialOrd, Ord)]
 pub struct Eid(SmolStr);

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

@@ -30,7 +30,6 @@ use super::PrincipalOrResource;
 /// The name can include namespaces.
 /// Clone is O(1).
 #[derive(Debug, Clone)]
-#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
 pub struct Name {
     /// Basename
     pub(crate) id: Id,
@@ -218,6 +217,17 @@ impl FromNormalizedStr for Name {
     }
 }
 
+#[cfg(feature = "arbitrary")]
+impl<'a> arbitrary::Arbitrary<'a> for Name {
+    fn arbitrary(u: &mut arbitrary::Unstructured<'a>) -> arbitrary::Result<Self> {
+        Ok(Self {
+            id: u.arbitrary()?,
+            path: u.arbitrary()?,
+            loc: None,
+        })
+    }
+}
+
 struct NameVisitor;
 
 impl<'de> serde::de::Visitor<'de> for NameVisitor {