language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge fixes

Browse source
This commit is contained in:
Anton-4 2021-08-21 20:10:21 +02:00
parent 169520f956
commit fe1a2c35ff
6 changed files with 15 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

16
compiler/module/src/symbol.rs
View file

@ -553,24 +553,26 @@ impl IdentIds {
pub fn update_key(
&mut self,
old_ident_name: InlinableString,
new_ident_name: InlinableString,
old_ident_name: &str,
new_ident_name: &str,
) -> Result<IdentId, String> {
let ident_id_ref_opt = self.by_ident.get(&old_ident_name);
let old_ident: Ident = old_ident_name.into();
let ident_id_ref_opt = self.by_ident.get(&old_ident);
match ident_id_ref_opt {
Some(ident_id_ref) => {
let ident_id = (*ident_id_ref).clone();
self.by_ident.remove(&old_ident_name);
self.by_ident.insert(new_ident_name.clone(), ident_id);
self.by_ident.remove(&old_ident);
self.by_ident.insert(new_ident_name.into(), ident_id);
let by_id = &mut self.by_id;
let key_index_opt = by_id.iter().position(|x| *x == old_ident_name);
let key_index_opt = by_id.iter().position(|x| *x == old_ident);
if let Some(key_index) = key_index_opt {
if let Some(vec_elt) = by_id.get_mut(key_index) {
*vec_elt = new_ident_name;
*vec_elt = new_ident_name.into();
} else {
// we get the index from by_id so unless there is a bug in the rust std lib, this is unreachable
unreachable!()