summaryrefslogtreecommitdiff
path: root/plugins/bntl_utils/src/merge.rs
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/bntl_utils/src/merge.rs')
-rw-r--r--plugins/bntl_utils/src/merge.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/bntl_utils/src/merge.rs b/plugins/bntl_utils/src/merge.rs
index 454be10f..0a3b3377 100644
--- a/plugins/bntl_utils/src/merge.rs
+++ b/plugins/bntl_utils/src/merge.rs
@@ -101,12 +101,11 @@ fn merge_structures(s1: &Structure, s2: &Structure) -> Option<Ref<Structure>> {
for m in &s.members() {
members
.entry(m.offset)
- .and_modify(|(existing_name, existing_ty)| {
+ .and_modify(|(_existing_name, existing_ty)| {
// Update type if merge succeeds
if let Some(merged) = merge_recursive(existing_ty, &m.ty.contents) {
*existing_ty = merged;
}
- // Name collision: Keep existing (s1/first wins), ignoring m.name
})
.or_insert_with(|| (m.name.clone(), m.ty.contents.to_owned()));
}