diff options
author | Griffin Smith <grfn@gws.fyi> | 2021-03-19T23·43-0400 |
---|---|---|
committer | glittershark <grfn@gws.fyi> | 2021-03-20T20·20+0000 |
commit | b1c4b84dbac9073e5f4b1dd7c5e0b7f549a32200 (patch) | |
tree | 84b982b90d7fcd63ea3952d44c45747723de85d3 /users/glittershark/achilles/src/tc | |
parent | d031ec0234d1b9913667ee87ce9cd9f3e8dfe301 (diff) |
chore(gs/achilles): Integrate with the depot build r/2291
Get achilles building in Nix as part of the depot's build tree. This involved making it work with stable rust, since the depot only exposes stable rust to sub-packages, which turned out to be fairly straightforward. Also adds libffi as a new top-level expose, since it's required to build achilles Change-Id: I5f6dedb26c0b81ec258aedde1973e74903c07ece Reviewed-on: https://cl.tvl.fyi/c/depot/+/2612 Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
Diffstat (limited to 'users/glittershark/achilles/src/tc')
-rw-r--r-- | users/glittershark/achilles/src/tc/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/users/glittershark/achilles/src/tc/mod.rs b/users/glittershark/achilles/src/tc/mod.rs index 559ac993cc9b..52c18e6d5329 100644 --- a/users/glittershark/achilles/src/tc/mod.rs +++ b/users/glittershark/achilles/src/tc/mod.rs @@ -358,9 +358,9 @@ impl<'ast> Typechecker<'ast> { let mut universalize_type = move |ty| match ty { Type::Exist(tv) if self.resolve_tv(tv).is_none() => vars .entry(tv) - .or_insert_with_key(|tv| { + .or_insert_with(|| { let ty = self.fresh_univ(); - self.ctx.insert(*tv, ty.clone()); + self.ctx.insert(tv, ty.clone()); ty }) .clone(), |