print names of nonmergeable fieldsets.

embassy-rs · Aug 11, 2024 · a349968 · a349968
1 parent 5e98229
commit a349968
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/transform/common.rs b/src/transform/common.rs
@@ -83,14 +83,18 @@ impl Default for CheckLevel {
 }
 
 pub(crate) fn check_mergeable_fieldsets(
+    a_name: &str,
     a: &FieldSet,
+    b_name: &str,
     b: &FieldSet,
     level: CheckLevel,
 ) -> anyhow::Result<()> {
     if let Err(e) = check_mergeable_fieldsets_inner(a, b, level) {
         bail!(
-            "Cannot merge fieldsets.\nfirst: {:#?}\nsecond: {:#?}\ncause: {:?}",
+            "Cannot merge fieldsets.\nfirst: {} {:#?}\nsecond: {} {:#?}\ncause: {:?}",
+            a_name,
             a,
+            b_name,
             b,
             e
         )

diff --git a/src/transform/merge_fieldsets.rs b/src/transform/merge_fieldsets.rs
@@ -51,7 +51,7 @@ impl MergeFieldsets {
 
         for id in &ids {
             let fs2 = ir.fieldsets.get(id).unwrap();
-            check_mergeable_fieldsets(&fs, fs2, self.check)?;
+            check_mergeable_fieldsets(&main_id, &fs, id, fs2, self.check)?;
         }
 
         for id in &ids {