simplify IntroducedVariables

This commit is contained in:
Folkert 2022-03-18 23:39:45 +01:00
parent 9cb6261a4d
commit 9b63e6a3a9
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
5 changed files with 71 additions and 54 deletions

View file

@ -1651,18 +1651,18 @@ fn instantiate_rigids(
let mut new_rigid_variables: Vec<Variable> = Vec::new();
let mut rigid_substitution: ImMap<Variable, Type> = ImMap::default();
for (name, var) in introduced_vars.var_by_name.iter() {
for named in introduced_vars.named.iter() {
use std::collections::hash_map::Entry::*;
match ftv.entry(name.clone()) {
match ftv.entry(named.name.clone()) {
Occupied(occupied) => {
let existing_rigid = occupied.get();
rigid_substitution.insert(var.value, Type::Variable(*existing_rigid));
rigid_substitution.insert(named.variable, Type::Variable(*existing_rigid));
}
Vacant(vacant) => {
// It's possible to use this rigid in nested defs
vacant.insert(var.value);
new_rigid_variables.push(var.value);
vacant.insert(named.variable);
new_rigid_variables.push(named.variable);
}
}
}