Clean up

Author: MarkusSintonen

src/schema_traverse.rs

@@ -24,8 +24,8 @@ macro_rules! traverse_key_fn {
 macro_rules! traverse {
     ($($key:expr => $func:expr),*; $dict: expr, $ctx: expr) => {{
         $(traverse_key_fn!($key, $func, $dict, $ctx);)*
-        gather_serialization($dict, $ctx)?;
-        gather_meta($dict, $ctx)?;
+        traverse_key_fn!("serialization", gather_serialization, $dict, $ctx);
+        gather_meta($dict, $ctx)
     }}
 }
 
@@ -56,7 +56,7 @@ fn gather_definition_ref(schema_ref_dict: &Bound<'_, PyDict>, ctx: &mut GatherCt
                 ctx.recursively_seen_refs.insert(schema_ref_str.to_string());
 
                 gather_schema(definition.downcast_exact::<PyDict>()?, ctx)?;
-                gather_serialization(schema_ref_dict, ctx)?;
+                traverse_key_fn!("serialization", gather_serialization, schema_ref_dict, ctx);
                 gather_meta(schema_ref_dict, ctx)?;
 
                 ctx.recursively_seen_refs.remove(schema_ref_str);
@@ -75,11 +75,7 @@ fn gather_definition_ref(schema_ref_dict: &Bound<'_, PyDict>, ctx: &mut GatherCt
 }
 
 fn gather_serialization(schema: &Bound<'_, PyDict>, ctx: &mut GatherCtx) -> PyResult<()> {
-    if let Some(ser) = get!(schema, "serialization") {
-        let ser_dict = ser.downcast_exact::<PyDict>()?;
-        traverse!("schema" => gather_schema, "return_schema" => gather_schema; ser_dict, ctx);
-    }
-    Ok(())
+    traverse!("schema" => gather_schema, "return_schema" => gather_schema; schema, ctx)
 }
 
 fn gather_meta(schema: &Bound<'_, PyDict>, ctx: &mut GatherCtx) -> PyResult<()> {
@@ -133,7 +129,7 @@ fn gather_schema(schema: &Bound<'_, PyDict>, ctx: &mut GatherCtx) -> PyResult<()
         return py_err!(PyKeyError; "Schema type missing");
     }
     match type_.unwrap().downcast_exact::<PyString>()?.to_str()? {
-        "definition-ref" => gather_definition_ref(schema, ctx)?,
+        "definition-ref" => gather_definition_ref(schema, ctx),
         "definitions" => traverse!("schema" => gather_schema, "definitions" => gather_list; schema, ctx),
         "list" | "set" | "frozenset" | "generator" => traverse!("items_schema" => gather_schema; schema, ctx),
         "tuple" => traverse!("items_schema" => gather_list; schema, ctx),
@@ -157,8 +153,7 @@ fn gather_schema(schema: &Bound<'_, PyDict>, ctx: &mut GatherCtx) -> PyResult<()
         "computed-field" | "function-plain" => traverse!("return_schema" => gather_schema; schema, ctx),
         "function-wrap" => traverse!("return_schema" => gather_schema, "schema" => gather_schema; schema, ctx),
         _ => traverse!("schema" => gather_schema; schema, ctx),
-    };
-    Ok(())
+    }
 }
 
 pub struct GatherCtx<'a, 'py> {