Consider all installed toolchains in cache key

dist/restore/index.js

@@ -150809,7 +150809,7 @@ class CacheConfig {
         /** The prefix portion of the cache key */
         this.keyPrefix = "";
         /** The rust version considered for the cache key */
-        this.keyRust = "";
+        this.keyRust = [];
         /** The environment variables considered for the cache key */
         this.keyEnvs = [];
         /** The files considered for the cache key */
@@ -150863,12 +150863,15 @@ class CacheConfig {
         // The env vars are sorted, matched by prefix and hashed into the
         // resulting environment hash.
         let hasher = external_crypto_default().createHash("sha1");
-        const rustVersion = await getRustVersion(cmdFormat);
-        let keyRust = `${rustVersion.release} ${rustVersion.host}`;
-        hasher.update(keyRust);
-        hasher.update(rustVersion["commit-hash"]);
-        keyRust += ` (${rustVersion["commit-hash"]})`;
-        self.keyRust = keyRust;
+        const rustVersions = Array.from(await getRustVersions(cmdFormat));
+        // Doesn't matter how they're sorted, just as long as it's deterministic.
+        rustVersions.sort();
+        for (const rustVersion of rustVersions) {
+            const { release, host, "commit-hash": commitHash } = rustVersion;
+            const keyRust = `${release} ${host} ${commitHash}`;
+            hasher.update(keyRust);
+            self.keyRust.push(keyRust);
+        }
         // these prefixes should cover most of the compiler / rust / cargo keys
         const envPrefixes = ["CARGO", "CC", "CFLAGS", "CXX", "CMAKE", "RUST"];
         envPrefixes.push(...lib_core.getInput("env-vars").split(/\s+/).filter(Boolean));
@@ -151052,7 +151055,10 @@ class CacheConfig {
         lib_core.info(`.. Prefix:`);
         lib_core.info(`  - ${this.keyPrefix}`);
         lib_core.info(`.. Environment considered:`);
-        lib_core.info(`  - Rust Version: ${this.keyRust}`);
+        lib_core.info(`  - Rust Versions:`);
+        for (const rust of this.keyRust) {
+            lib_core.info(`    - ${rust}`);
+        }
         for (const env of this.keyEnvs) {
             lib_core.info(`  - ${env}`);
         }
@@ -151087,9 +151093,31 @@ function isCacheUpToDate() {
 function digest(hasher) {
     return hasher.digest("hex").substring(0, HASH_LENGTH);
 }
-async function getRustVersion(cmdFormat) {
-    const stdout = await getCmdOutput(cmdFormat, "rustc -vV");
-    let splits = stdout
+async function getRustVersions(cmdFormat) {
+    const versions = new Set();
+    versions.add(parseRustVersion(await getCmdOutput(cmdFormat, "rustc -vV")));
+    const stdout = await (async () => {
+        try {
+            return await getCmdOutput(cmdFormat, "rustup toolchain list --quiet");
+        }
+        catch (e) {
+            lib_core.warning(`Error running rustup toolchain list, falling back to default toolchain only: ${e}`);
+            return undefined;
+        }
+    })();
+    if (stdout !== undefined) {
+        for (const toolchain of stdout.split(/[\n\r]+/)) {
+            const trimmed = toolchain.trim();
+            if (!trimmed) {
+                continue;
+            }
+            versions.add(parseRustVersion(await getCmdOutput(cmdFormat, `rustup run ${toolchain} rustc -vV`)));
+        }
+    }
+    return versions;
+}
+function parseRustVersion(stdout) {
+    const splits = stdout
         .split(/[\n\r]+/)
         .filter(Boolean)
         .map((s) => s.split(":").map((s) => s.trim()))

dist/save/index.js

@@ -150809,7 +150809,7 @@ class CacheConfig {
         /** The prefix portion of the cache key */
         this.keyPrefix = "";
         /** The rust version considered for the cache key */
-        this.keyRust = "";
+        this.keyRust = [];
         /** The environment variables considered for the cache key */
         this.keyEnvs = [];
         /** The files considered for the cache key */
@@ -150863,12 +150863,15 @@ class CacheConfig {
         // The env vars are sorted, matched by prefix and hashed into the
         // resulting environment hash.
         let hasher = external_crypto_default().createHash("sha1");
-        const rustVersion = await getRustVersion(cmdFormat);
-        let keyRust = `${rustVersion.release} ${rustVersion.host}`;
-        hasher.update(keyRust);
-        hasher.update(rustVersion["commit-hash"]);
-        keyRust += ` (${rustVersion["commit-hash"]})`;
-        self.keyRust = keyRust;
+        const rustVersions = Array.from(await getRustVersions(cmdFormat));
+        // Doesn't matter how they're sorted, just as long as it's deterministic.
+        rustVersions.sort();
+        for (const rustVersion of rustVersions) {
+            const { release, host, "commit-hash": commitHash } = rustVersion;
+            const keyRust = `${release} ${host} ${commitHash}`;
+            hasher.update(keyRust);
+            self.keyRust.push(keyRust);
+        }
         // these prefixes should cover most of the compiler / rust / cargo keys
         const envPrefixes = ["CARGO", "CC", "CFLAGS", "CXX", "CMAKE", "RUST"];
         envPrefixes.push(...core.getInput("env-vars").split(/\s+/).filter(Boolean));
@@ -151052,7 +151055,10 @@ class CacheConfig {
         core.info(`.. Prefix:`);
         core.info(`  - ${this.keyPrefix}`);
         core.info(`.. Environment considered:`);
-        core.info(`  - Rust Version: ${this.keyRust}`);
+        core.info(`  - Rust Versions:`);
+        for (const rust of this.keyRust) {
+            core.info(`    - ${rust}`);
+        }
         for (const env of this.keyEnvs) {
             core.info(`  - ${env}`);
         }
@@ -151087,9 +151093,31 @@ function isCacheUpToDate() {
 function digest(hasher) {
     return hasher.digest("hex").substring(0, HASH_LENGTH);
 }
-async function getRustVersion(cmdFormat) {
-    const stdout = await getCmdOutput(cmdFormat, "rustc -vV");
-    let splits = stdout
+async function getRustVersions(cmdFormat) {
+    const versions = new Set();
+    versions.add(parseRustVersion(await getCmdOutput(cmdFormat, "rustc -vV")));
+    const stdout = await (async () => {
+        try {
+            return await getCmdOutput(cmdFormat, "rustup toolchain list --quiet");
+        }
+        catch (e) {
+            core.warning(`Error running rustup toolchain list, falling back to default toolchain only: ${e}`);
+            return undefined;
+        }
+    })();
+    if (stdout !== undefined) {
+        for (const toolchain of stdout.split(/[\n\r]+/)) {
+            const trimmed = toolchain.trim();
+            if (!trimmed) {
+                continue;
+            }
+            versions.add(parseRustVersion(await getCmdOutput(cmdFormat, `rustup run ${toolchain} rustc -vV`)));
+        }
+    }
+    return versions;
+}
+function parseRustVersion(stdout) {
+    const splits = stdout
         .split(/[\n\r]+/)
         .filter(Boolean)
         .map((s) => s.split(":").map((s) => s.trim()))