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

4 files changed, 31 insertions, 10 deletions

diff --git a/users/glittershark/achilles/default.nix b/users/glittershark/achilles/default.nix
index 4a72bac2ba..8ce6fda5c1 100644
--- a/users/glittershark/achilles/default.nix
+++ b/users/glittershark/achilles/default.nix
@@ -1,3 +1,20 @@
-# TODO(glittershark): Write the actual default.nix
+{ pkgs, ... }:
 
-_: "nothing to see yet"
+pkgs.naersk.buildPackage {
+  src = ./.;
+
+  buildInputs = with pkgs; [
+    clang_11
+    llvmPackages.llvm
+    llvmPackages.bintools
+    llvmPackages.clang
+    llvmPackages.libclang.lib
+    zlib
+    ncurses
+    libxml2
+    libffi
+    pkgconfig
+  ];
+
+  doCheck = true;
+}
diff --git a/users/glittershark/achilles/src/main.rs b/users/glittershark/achilles/src/main.rs
index 4ba0aaf33e..d5b00d6b6c 100644
--- a/users/glittershark/achilles/src/main.rs
+++ b/users/glittershark/achilles/src/main.rs
@@ -1,6 +1,3 @@
-#![feature(str_split_once)]
-#![feature(or_insert_with_key)]
-
 use clap::Clap;
 
 pub mod ast;
diff --git a/users/glittershark/achilles/src/parser/expr.rs b/users/glittershark/achilles/src/parser/expr.rs
index 12c55df02b..99c8018fd0 100644
--- a/users/glittershark/achilles/src/parser/expr.rs
+++ b/users/glittershark/achilles/src/parser/expr.rs
@@ -165,9 +165,16 @@ named!(bool_(&str) -> Literal, alt!(
 ));
 
 fn string_internal(i: &str) -> nom::IResult<&str, Cow<'_, str>, nom::error::Error<&str>> {
-    let (s, rem) = i
-        .split_once('"')
-        .ok_or_else(|| nom::Err::Error(nom::error::Error::new(i, nom::error::ErrorKind::Tag)))?;
+    // TODO(grfn): use String::split_once when that's stable
+    let (s, rem) = if let Some(pos) = i.find('"') {
+        (&i[..pos], &i[(pos + 1)..])
+    } else {
+        return Err(nom::Err::Error(nom::error::Error::new(
+            i,
+            nom::error::ErrorKind::Tag,
+        )));
+    };
+
     Ok((rem, Cow::Borrowed(s)))
 }
 
diff --git a/users/glittershark/achilles/src/tc/mod.rs b/users/glittershark/achilles/src/tc/mod.rs
index 559ac993cc..52c18e6d53 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(),