Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/api/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,28 @@ fn merge_resources(dst: &mut Resources, src: Resources) {
}

fn merge_types(dst: &mut Types, src: Types) -> anyhow::Result<()> {
let mut mismatching_types = vec![];
for (name, ty) in src {
match dst.entry(name) {
btree_map::Entry::Vacant(entry) => {
entry.insert(ty);
}
btree_map::Entry::Occupied(entry) => {
if *entry.get() != ty {
bail!("mismatching definitions for {}", entry.key());
mismatching_types.push(entry.key().clone());
}
}
}
}

if !mismatching_types.is_empty() {
eprintln!("Found {} mismatching types", mismatching_types.len());
for m in mismatching_types {
eprintln!("mismatching definitions for {m}")
}
bail!("mismatching definitions found");
}

Ok(())
}

Expand Down