language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 08:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Dryasdust was a popular word in 1860

Browse source
This commit is contained in:
Ayaz Hafiz 2022-05-07 22:05:05 -04:00 • committed by ayazhafiz
parent e31e89ac66
commit 798c28fccd
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/can/src/abilities.rs
View file

@ -34,6 +34,7 @@ pub struct MemberSpecialization {
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct SpecializationId(u64); pub struct SpecializationId(u64);
#[allow(clippy::derivable_impls)] // let's be explicit about this
impl Default for SpecializationId { impl Default for SpecializationId {
fn default() -> Self { fn default() -> Self {
Self(0) Self(0)

2
compiler/mono/src/copy.rs
View file

@ -67,7 +67,7 @@ pub fn deep_copy_type_vars_into_expr<'a>(
loc_elems: loc_elems.iter().map(|le| le.map(go_help)).collect(), loc_elems: loc_elems.iter().map(|le| le.map(go_help)).collect(),
}, },
Var(sym) => Var(*sym), Var(sym) => Var(*sym),
AbilityMember(sym, specialization) => AbilityMember(*sym, specialization.clone()), AbilityMember(sym, specialization) => AbilityMember(*sym, *specialization),
When { When {
loc_cond, loc_cond,
cond_var, cond_var,

13
compiler/mono/src/ir.rs
View file

@ -2560,7 +2560,7 @@ fn resolve_abilities_in_specialized_body<'a>(
self.abilities_store self.abilities_store
.insert_resolved(*specialization_id, specialization); .insert_resolved(*specialization_id, specialization);
debug_assert!(!self.specialized.contains(&specialization_id)); debug_assert!(!self.specialized.contains(specialization_id));
self.specialized.push(*specialization_id); self.specialized.push(*specialization_id);
} }
_ => walk_expr(self, expr), _ => walk_expr(self, expr),
@ -7056,13 +7056,10 @@ fn can_reuse_symbol<'a>(
use ReuseSymbol::*; use ReuseSymbol::*;
let symbol = match expr { let symbol = match expr {
AbilityMember(_, specialization_id) => { AbilityMember(_, specialization_id) => env
let specialization_symbol = env .abilities_store
.abilities_store .get_resolved(*specialization_id)
.get_resolved(*specialization_id) .expect("Specialization must be known!"),
.expect("Specialization must be known!");
specialization_symbol
}
Var(symbol) => *symbol, Var(symbol) => *symbol,
_ => return NotASymbol, _ => return NotASymbol,
}; };