mirrors/rust-cache
3
0
Fork 0
mirror of https://github.com/Swatinem/rust-cache synced 2026-08-08 22:41:09 +00:00
Code Activity

fix: support Cargo V2 build dir layout

Browse source
This commit is contained in:
Clayton Ramsey 2026-08-05 09:56:31 -05:00
parent 72d126e709
commit f01556f091
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/cleanup.ts
View file

@ -245,6 +245,12 @@ const ONE_WEEK = 7 * 24 * 3600 * 1000;
* Otherwise, it will remove everything that does not match any string in the
* `keepPrefix` set.
* The matching strips and trailing `-$hash` suffix.
*
* Cargo's newer `build-dir` layout (rust-lang/cargo#17258) nests the hash as
* a subdirectory instead of appending it, so entries there are bare package
* names with no suffix to strip. Check for an exact match first so those
* names (which may themselves contain hyphens) aren't mistaken for a
* `<name>-<hash>` entry from the old layout and truncated incorrectly.
*/
async function rmExcept(dirName: string, keepPrefix: Set<string>, checkTimestamp = false) {
const dir = await fs.promises.opendir(dirName);
@ -262,14 +268,21 @@ async function rmExcept(dirName: string, keepPrefix: Set<string>, checkTimestamp
let name = dirent.name;
// strip the trailing hash
const idx = name.lastIndexOf("-");
if (idx !== -1) {
name = name.slice(0, idx);
}
// in Cargo's V1 layout, all packages are suffixed by their hash.
// in V2, all package hashes are subdirectories instead.
// Check both possible naming standards for packages and accept either.
// v2 package format
if (!keepPrefix.has(name)) {
await rm(dir.path, dirent);
// now check for v1 package format
// strip the trailing hash
const idx = name.lastIndexOf("-");
if (idx !== -1) {
name = name.slice(0, idx);
}
if (!keepPrefix.has(name)) {
await rm(dir.path, dirent);
}
}
}
}