handle clusters after collect

Author: burrbull

src/patch/peripheral.rs

@@ -332,15 +332,6 @@ impl PeripheralExt for Peripheral {
             }
         }
 
-        // Handle clusters
-        for (cspec, cluster) in pmod.hash_iter("_clusters") {
-            let cspec = cspec.str()?;
-            if !cspec.starts_with('_') {
-                self.process_cluster(cspec, cluster.hash()?, update_fields)
-                    .with_context(|| format!("According to `{cspec}`"))?;
-            }
-        }
-
         // Handle registers
         for (rspec, register) in pmod {
             let rspec = rspec.str()?;
@@ -364,6 +355,15 @@ impl PeripheralExt for Peripheral {
                 .with_context(|| format!("Collecting registers in cluster `{cname}`"))?;
         }
 
+        // Handle clusters
+        for (cspec, cluster) in pmod.hash_iter("_clusters") {
+            let cspec = cspec.str()?;
+            if !cspec.starts_with('_') {
+                self.process_cluster(cspec, cluster.hash()?, update_fields)
+                    .with_context(|| format!("According to `{cspec}`"))?;
+            }
+        }
+
         Ok(())
     }
 }