updates for cedar#1027

cedar-drt/fuzz/src/dump.rs

@@ -102,7 +102,8 @@ pub fn dump(
             resource: dump_request_var(q.resource()),
             context: dump_context(
                 q.context()
-                    .expect("`dump` does not support requests missing context"),
+                    .expect("`dump` does not support requests missing context")
+                    .clone(),
             ),
             validate_request: true,
             decision: a.decision,
@@ -220,31 +221,27 @@ fn dump_request_var(var: &EntityUIDEntry) -> JsonValueWithNoDuplicateKeys {
             panic!("`dump` does not support requests with unknown fields")
         }
         EntityUIDEntry::Known { euid, .. } => {
-            let json = serde_json::to_value(TypeAndId::from(euid as &EntityUID))
+            serde_json::to_value(TypeAndId::from(euid as &EntityUID))
                 .expect("failed to serialize euid")
-                .into();
-            json
+                .into()
         }
     }
 }
 
 /// Dump the context to a "natural" json value
-fn dump_context(context: &Context) -> JsonValueWithNoDuplicateKeys {
+fn dump_context(context: Context) -> JsonValueWithNoDuplicateKeys {
     let context = context
-        .iter()
-        .map(|it| {
-            it.map(|(k, pval)| {
-                (
-                    k.clone(),
-                    RestrictedExpr::try_from(pval)
-                        .unwrap()
-                        .to_natural_json()
-                        .unwrap(),
-                )
-            })
-            .collect::<HashMap<_, _>>()
+        .into_iter()
+        .map(|(k, pval)| {
+            (
+                k,
+                RestrictedExpr::try_from(pval)
+                    .unwrap()
+                    .to_natural_json()
+                    .unwrap(),
+            )
         })
-        .unwrap_or_default();
+        .collect::<HashMap<_, _>>();
     serde_json::to_value(context)
         .expect("failed to serialize context")
         .into()

cedar-policy-generators/src/expr.rs

@@ -566,7 +566,7 @@ impl<'a> ExprGenerator<'a> {
                                             // This does not use an explicit namespace because entity types
                                             // implicitly use the schema namespace if an explicit one is not
                                             // provided.
-                                            name: ast::Name::from(entity_name.clone()).into(),
+                                            name: ast::Name::from(entity_name.clone()),
                                         }
                                     ),
                                     max_depth - 1,

cedar-policy-generators/src/request.rs

@@ -74,7 +74,7 @@ impl std::fmt::Display for Request {
             "(principal : {}, action: {}, resource: {})",
             self.principal, self.action, self.resource
         )?;
-        let mut context = self.context.iter().unwrap().peekable();
+        let mut context = self.context.clone().into_iter().peekable();
         if context.peek().is_some() {
             writeln!(f, "\nWith context: {{")?;
             for (attr, val) in context {

cedar-policy-generators/src/schema.rs

@@ -826,7 +826,7 @@ impl Schema {
         for i in 0..entity_types.len() {
             for name in &entity_type_ids[(i + 1)..] {
                 if u.ratio::<u8>(1, 2)? {
-                    let etype = ast::Name::from(name.clone()).into();
+                    let etype = ast::Name::from(name.clone());
                     entity_types[i].1.member_of_types.push(etype);
                 }
             }