Add a selftest and support for .cargo/bin

src/common.ts

@@ -16,12 +16,14 @@ if (cwd) {
   process.chdir(cwd);
 }
 
+export const stateBins = "RUST_CACHE_BINS";
 export const stateKey = "RUST_CACHE_KEY";
 const stateHash = "RUST_CACHE_HASH";
 
 const home = os.homedir();
 const cargoHome = process.env.CARGO_HOME || path.join(home, ".cargo");
 export const paths = {
+  cargoHome,
   index: path.join(cargoHome, "registry/index"),
   cache: path.join(cargoHome, "registry/cache"),
   git: path.join(cargoHome, "git"),
@@ -67,12 +69,33 @@ export async function getCacheConfig(): Promise<CacheConfig> {
   key += await getRustKey();
 
   return {
-    paths: [paths.index, paths.cache, paths.git, paths.target],
+    paths: [
+      path.join(cargoHome, "bin"),
+      path.join(cargoHome, ".crates2.json"),
+      path.join(cargoHome, ".crates.toml"),
+      paths.git,
+      paths.cache,
+      paths.index,
+      paths.target,
+    ],
     key: `${key}-${lockHash}`,
     restoreKeys: [key],
   };
 }
 
+export async function getCargoBins(): Promise<Set<string>> {
+  const { installs }: { installs: { [key: string]: { bins: Array<string> } } } = JSON.parse(
+    await fs.promises.readFile(path.join(paths.cargoHome, ".crates2.json"), "utf8"),
+  );
+  const bins = new Set<string>();
+  for (const pkg of Object.values(installs)) {
+    for (const bin of pkg.bins) {
+      bins.add(bin);
+    }
+  }
+  return bins;
+}
+
 async function getRustKey(): Promise<string> {
   const rustc = await getRustVersion();
   return `${rustc.release}-${rustc.host}-${rustc["commit-hash"].slice(0, 12)}`;

src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

src/restore.ts

@@ -1,6 +1,6 @@
 import * as cache from "@actions/cache";
 import * as core from "@actions/core";
-import { cleanTarget, getCacheConfig, getPackages, stateKey } from "./common";
+import { cleanTarget, getCacheConfig, getCargoBins, getPackages, stateBins, stateKey } from "./common";
 
 async function run() {
   try {
@@ -8,6 +8,9 @@ async function run() {
 
     const { paths, key, restoreKeys } = await getCacheConfig();
 
+    const bins = await getCargoBins();
+    core.saveState(stateBins, JSON.stringify([...bins]));
+
     core.info(`Restoring paths:\n    ${paths.join("\n    ")}`);
     core.info(`In directory:\n    ${process.cwd()}`);
     core.info(`Using keys:\n    ${[key, ...restoreKeys].join("\n    ")}`);

src/save.ts

@@ -5,7 +5,17 @@ import * as glob from "@actions/glob";
 import * as io from "@actions/io";
 import fs from "fs";
 import path from "path";
-import { cleanTarget, getCacheConfig, getPackages, Packages, paths, rm, stateKey } from "./common";
+import {
+  cleanTarget,
+  getCacheConfig,
+  getCargoBins,
+  getPackages,
+  Packages,
+  paths,
+  rm,
+  stateBins,
+  stateKey,
+} from "./common";
 
 async function run() {
   try {
@@ -26,6 +36,10 @@ async function run() {
       await cleanRegistry(registryName, packages);
     } catch {}
 
+    try {
+      await cleanBin();
+    } catch {}
+
     try {
       await cleanGit(packages);
     } catch {}
@@ -56,6 +70,22 @@ async function getRegistryName(): Promise<string> {
   return path.basename(path.dirname(first));
 }
 
+async function cleanBin() {
+  const bins = await getCargoBins();
+  const oldBins = JSON.parse(core.getState(stateBins));
+
+  for (const bin of oldBins) {
+    bins.delete(bin);
+  }
+
+  const dir = await fs.promises.opendir(path.join(paths.cargoHome, "bin"));
+  for await (const dirent of dir) {
+    if (dirent.isFile() && !bins.has(dirent.name)) {
+      await rm(dir.path, dirent);
+    }
+  }
+}
+
 async function cleanRegistry(registryName: string, packages: Packages) {
   await io.rmRF(path.join(paths.index, registryName, ".cache"));