From f1fc29f77eb36a9d623a09d82dc6b0c91877fa68 Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Sat, 8 Mar 2025 14:39:15 -0700
Subject: [PATCH] Split report changes into separate proto

---
 objdiff-core/build.rs                    |  10 ++-
 objdiff-core/protos/changes.proto        |  59 +++++++++++++++++
 objdiff-core/protos/proto_descriptor.bin | Bin 17601 -> 17633 bytes
 objdiff-core/protos/report.proto         |  78 ++++-------------------
 4 files changed, 80 insertions(+), 67 deletions(-)
 create mode 100644 objdiff-core/protos/changes.proto

diff --git a/objdiff-core/build.rs b/objdiff-core/build.rs
index fdd4e63..48e1a34 100644
--- a/objdiff-core/build.rs
+++ b/objdiff-core/build.rs
@@ -19,7 +19,15 @@ fn compile_protos() {
         .map(|m| m.modified().unwrap())
         .unwrap_or(std::time::SystemTime::UNIX_EPOCH);
     let mut run_protoc = false;
-    let proto_files = vec![root.join("report.proto")];
+    let proto_files = root
+        .read_dir()
+        .unwrap()
+        .filter_map(|e| {
+            let e = e.unwrap();
+            let path = e.path();
+            (path.extension() == Some(std::ffi::OsStr::new("proto"))).then_some(path)
+        })
+        .collect::<Vec<_>>();
     for proto_file in &proto_files {
         println!("cargo:rerun-if-changed={}", proto_file.display());
         let mtime = match std::fs::metadata(proto_file) {
diff --git a/objdiff-core/protos/changes.proto b/objdiff-core/protos/changes.proto
new file mode 100644
index 0000000..6355975
--- /dev/null
+++ b/objdiff-core/protos/changes.proto
@@ -0,0 +1,59 @@
+syntax = "proto3";
+
+import "report.proto";
+
+package objdiff.report;
+
+// A pair of reports to compare and generate changes
+message ChangesInput {
+  // The previous report
+  Report from = 1;
+  // The current report
+  Report to = 2;
+}
+
+// Changes between two reports
+message Changes {
+  // The progress info for the previous report
+  Measures from = 1;
+  // The progress info for the current report
+  Measures to = 2;
+  // Units that changed
+  repeated ChangeUnit units = 3;
+}
+
+// A changed unit
+message ChangeUnit {
+  // The name of the unit
+  string name = 1;
+  // The previous progress info (omitted if new)
+  optional Measures from = 2;
+  // The current progress info (omitted if removed)
+  optional Measures to = 3;
+  // Sections that changed
+  repeated ChangeItem sections = 4;
+  // Functions that changed
+  repeated ChangeItem functions = 5;
+  // Extra metadata for this unit
+  optional ReportUnitMetadata metadata = 6;
+}
+
+// A changed section or function
+message ChangeItem {
+  // The name of the item
+  string name = 1;
+  // The previous progress info (omitted if new)
+  optional ChangeItemInfo from = 2;
+  // The current progress info (omitted if removed)
+  optional ChangeItemInfo to = 3;
+  // Extra metadata for this item
+  optional ReportItemMetadata metadata = 4;
+}
+
+// Progress info for a section or function
+message ChangeItemInfo {
+  // The overall match percent for this item
+  float fuzzy_match_percent = 1;
+  // The size of the item in bytes
+  uint64 size = 2;
+}
diff --git a/objdiff-core/protos/proto_descriptor.bin b/objdiff-core/protos/proto_descriptor.bin
index 9312c29c4cb4829bd2bc9c94a0fe5707ec55ee82..c281ade0bb1343851ead9bd257d3dc12f0df7237 100644
GIT binary patch
delta 2599
zcmX@u$@s97al-=zg{KBwJVmJm`9&pq1x5KK`9gg8Nm(hGX=!>8(a9T?&uwN@+{m=K
zUPX(A%WJYC7n=|Z14HiQ039(dRW2qL1|b$!2ENHzMv6iVj6%$;9DH0VTr4aMObkNI
z?33pjDHt#?F|Y|SvompV@o=$%Bp8L5*|~*bJZ2$gb}?}-b+9HzA!g3WZ;h1g7?>DY
zgqS(uni$!Hm^rycp_&*$>cpgBJZ2$gPC0olS+EgILd@Kg{fs3iKjKm2QUVJx3o-Lf
zo^C8>$H2tQBE-xKH<g)9h?$pL5^4@JqYyK%lnRUo(xtA!Wx&P6!YITd$Y3<NKu1Ri
zWVIlN09ObX3kxI2lfskN=>!-sGBL0UF$*)XgLN}9fx<$V1L8tPCI)69W??ybE-kPo
zMj>X=$$GkK28>LMtU}D9OdL>6AhSg|AtA%a#K<hfEGj0>r4QD`B*ZK}xkXpofRTxb
zRft&}u8E0Jh*_Ky5;BZTOw2;e;u4ZvnqW=LLd=qr@9U}>FfuW-3NcH<od@!&B!>*t
zUS^Owc?GERScI6RC!6SjoX5f{#4HWBiG@*!SsLy<7G@!4X}I%Pg_vb0cj<wg#|mP@
zHL)@ZG0Vc8$I2|kEDLuYn-H`7<fnQd=drO0G0Vf9$HpkcEDv`c8?z9zyu1RJ2G~#R
zLd=Sjt@Kq47@62vg_srLHnB4bF)MOPK>ftdEX1rREyJY-*2E#itUS3-U&(-xiGx*$
zSsAX0gHecCnNtd?iGx{)Sy@(&OAoAxQ;1o0@&kP>14brJRv~6pxbrv}g_u=26rq|p
znT42DRn)jF!J4>)nAIo$GmxDeZXjX6$i&4e#H<dtjf+u;S)Ef1s*#IXh*@1yn#&lh
zkz0sabMkxxeFH`&ZdM^?O}K5`j6%$s9I{YN+{{AEnhHu#+jxYSwI}~GFg0Lg;$anH
z)`r`}!zje84Y!GhS%_I1ZWFH%v+m^i2C|bI429|$nRr=+n04W{@iGcA>%wj0Wfo%A
zRZs$FX+|bKA!dChDJgM<ko=Ow9EH5n+@#bZh5R&y(!9))Vo3gGWa485DTAeHK1LyC
zeNGXm>-m_4nDxaaxpcr@<`-gSHDr>NlAmm6AURpzh+CDBiJw)7*%0mxenuf?Lr!t1
zZhmGVW<x2N%`c3<a9AX<flDl7uIb`jyvZ4fdFiRe*b6Z!lp=2PN{zY9CWrYU1(_8i
z7Y7$3j}S8hgAf-d7ZWps5Hk~l7)X#wh?#{!oXZ|k$gwl<Onz=-T@T9G>>MJ{l7#_O
zMhQuYDuiUDDijo@mSyIb7Aru?PDpq_N<U7hj~KuO11Bdh*hdWDf`L;&kV_F<PB98G
zb2AA@iGWQ@E-flb%_~7OOb=8La>Gpnl^EQd+)&d%B?dPiKbIz?$l_-Zn|$6@RScwv
zpM#&v0vzZJLd=3pB2wCu^X#N2tJ;ZziY_*g7{tAhqDzpQA8aP1=n@nX<}wFsW)xx;
zo}6W83@W<VK;<1w6UYu>Ziu%aMVBztTZ~Lhpz`jlooogp6B7%lyn|_CViRH(g%;|J
zOrU~H6k4c53NleSc`g|)CKe_k7D)y*MkxUWM+Hbsr+||j7Z(>7GYd$cB!>`}G8YRA
z6R1R%o}6eUIyu{v%ZLeFD#J=JCUD?OLj#`)9Qe`#f?QT$ji7RhNp^CAlYtAUo?-%5
zK(f%Pf{6(f?y}HYi-`&3U0D%GS;GV_sb!^QxNN}&F@Z`l>B%>pjGZ6`fjlh_Hwffu
zdALC!$IFXAN(3fw=`AlQ1<r0@j^gBb4l+<<m{~xj9VG0Sm_SvRA~funm_X&ZqL>^w
z&X|}$<+-Aw5|=92JuINIkI_*UY77gA4|fd<n-H@y+!#;^uPi1HH3n3|D=R5;X@iXc
zm4K5En5o+_F|o3MN<)}SSlNV_Rk<PM6B84tyjPV|gBk%U?^QLmxU{*LSeS)aG#QL0
zUvN|w14SFi$(qn;V+KW=_T)q>c>`u}l)(xzW^j~gL!*ot9A(<jC}ReNo$ll~CnK=W
zn86XI3-uW@IKp(HbvrXS!gQq|0mKZBFkM9@aD*{~(x?99>rSRnV?fcR4>txBUHWii
zKvwEYLF!Fra180oD}V!t8C3HcPCj5JJGsD_4Qdo9$_(K~fuhV18c@vOC^Lix6f-!=
z3^ld5Ou3j?ScF(i8LTGnbJhh16ev<mImEckxL8<NKmlbwnZw%1fCU^-=Fozh1sqW3
w&=v;^IH1hs<iQ0kIEPqH-e9Gn%K~n3SVGGW7I3gwLPM7Y94wXsg0PYm0K0tnDF6Tf

delta 2693
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

diff --git a/objdiff-core/protos/report.proto b/objdiff-core/protos/report.proto
index ed7ebb8..279bbb0 100644
--- a/objdiff-core/protos/report.proto
+++ b/objdiff-core/protos/report.proto
@@ -2,6 +2,18 @@ syntax = "proto3";
 
 package objdiff.report;
 
+// Project progress report
+message Report {
+  // Overall progress info
+  Measures measures = 1;
+  // Units within this report
+  repeated ReportUnit units = 2;
+  // Report version
+  uint32 version = 3;
+  // Progress categories
+  repeated ReportCategory categories = 4;
+}
+
 // Progress info for a report or unit
 message Measures {
   // Overall match percent, including partially matched functions and data
@@ -38,18 +50,6 @@ message Measures {
   uint32 complete_units = 16;
 }
 
-// Project progress report
-message Report {
-  // Overall progress info
-  Measures measures = 1;
-  // Units within this report
-  repeated ReportUnit units = 2;
-  // Report version
-  uint32 version = 3;
-  // Progress categories
-  repeated ReportCategory categories = 4;
-}
-
 message ReportCategory {
   // The ID of the category
   string id = 1;
@@ -108,57 +108,3 @@ message ReportItemMetadata {
   // The virtual address of the function or section
   optional uint64 virtual_address = 2;
 }
-
-// A pair of reports to compare and generate changes
-message ChangesInput {
-  // The previous report
-  Report from = 1;
-  // The current report
-  Report to = 2;
-}
-
-// Changes between two reports
-message Changes {
-  // The progress info for the previous report
-  Measures from = 1;
-  // The progress info for the current report
-  Measures to = 2;
-  // Units that changed
-  repeated ChangeUnit units = 3;
-}
-
-// A changed unit
-message ChangeUnit {
-  // The name of the unit
-  string name = 1;
-  // The previous progress info (omitted if new)
-  optional Measures from = 2;
-  // The current progress info (omitted if removed)
-  optional Measures to = 3;
-  // Sections that changed
-  repeated ChangeItem sections = 4;
-  // Functions that changed
-  repeated ChangeItem functions = 5;
-  // Extra metadata for this unit
-  optional ReportUnitMetadata metadata = 6;
-}
-
-// A changed section or function
-message ChangeItem {
-  // The name of the item
-  string name = 1;
-  // The previous progress info (omitted if new)
-  optional ChangeItemInfo from = 2;
-  // The current progress info (omitted if removed)
-  optional ChangeItemInfo to = 3;
-  // Extra metadata for this item
-  optional ReportItemMetadata metadata = 4;
-}
-
-// Progress info for a section or function
-message ChangeItemInfo {
-  // The overall match percent for this item
-  float fuzzy_match_percent = 1;
-  // The size of the item in bytes
-  uint64 size = 2;
-}