mirrors/rust-cache
3
0
Fork 0
mirror of https://github.com/Swatinem/rust-cache synced 2025-04-05 21:24:07 +00:00
Code Activity

revert explicit dir close

Browse source
This commit is contained in:
Arpad Borsos 2022-09-04 13:22:47 +02:00
parent 86531941c2
commit 0d72e5f9a0
No known key found for this signature in database
GPG key ID: FC7BCA77824B3298
3 changed files with 9 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dist/restore/index.js vendored
View file

@ -64618,7 +64618,6 @@ async function cleanTargetDir(targetDir, packages, checkTimestamp = false) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function cleanProfileTarget(profileDir, packages, checkTimestamp = false) { async function cleanProfileTarget(profileDir, packages, checkTimestamp = false) {
lib_core.debug(`cleaning profile directory "${profileDir}"`); lib_core.debug(`cleaning profile directory "${profileDir}"`);
@ -64662,7 +64661,6 @@ async function cleanBin() {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function cleanRegistry(packages) { async function cleanRegistry(packages) {
// `.cargo/registry/src` // `.cargo/registry/src`
@ -64674,16 +64672,14 @@ async function cleanRegistry(packages) {
if (dirent.isDirectory()) { if (dirent.isDirectory()) {
// eg `.cargo/registry/index/github.com-1ecc6299db9ec823` // eg `.cargo/registry/index/github.com-1ecc6299db9ec823`
// or `.cargo/registry/index/index.crates.io-e139d0d48fed7772` // or `.cargo/registry/index/index.crates.io-e139d0d48fed7772`
const dir = await fs.promises.opendir(path.join(indexDir.path, dirent.name)); const dirPath = path.join(indexDir.path, dirent.name);
// for a git registry, we can remove `.cache`, as cargo will recreate it from git // for a git registry, we can remove `.cache`, as cargo will recreate it from git
if (await exists(path.join(dir.path, ".git"))) { if (await exists(path.join(dirPath, ".git"))) {
await rmRF(path.join(dir.path, ".cache")); await rmRF(path.join(dirPath, ".cache"));
} }
await dir.close();
// TODO: else, clean `.cache` based on the `packages` // TODO: else, clean `.cache` based on the `packages`
} }
} }
await indexDir.close();
const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`)); const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`));
// `.cargo/registry/cache` // `.cargo/registry/cache`
const cacheDir = await fs.promises.opendir(path.join(CARGO_HOME, "registry", "cache")); const cacheDir = await fs.promises.opendir(path.join(CARGO_HOME, "registry", "cache"));
@ -64698,10 +64694,8 @@ async function cleanRegistry(packages) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
} }
await cacheDir.close();
} }
async function cleanGit(packages) { async function cleanGit(packages) {
const coPath = path.join(CARGO_HOME, "git", "checkouts"); const coPath = path.join(CARGO_HOME, "git", "checkouts");
@ -64730,7 +64724,6 @@ async function cleanGit(packages) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
catch { } catch { }
// clean the checkouts // clean the checkouts
@ -64751,9 +64744,7 @@ async function cleanGit(packages) {
await rm(refsDir.path, dirent); await rm(refsDir.path, dirent);
} }
} }
await refsDir.close();
} }
await dir.close();
} }
catch { } catch { }
} }
@ -64786,7 +64777,6 @@ async function rmExcept(dirName, keepPrefix, checkTimestamp = false) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function rm(parent, dirent) { async function rm(parent, dirent) {
try { try {

16
dist/save/index.js vendored
View file

@ -64618,7 +64618,6 @@ async function cleanTargetDir(targetDir, packages, checkTimestamp = false) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function cleanProfileTarget(profileDir, packages, checkTimestamp = false) { async function cleanProfileTarget(profileDir, packages, checkTimestamp = false) {
core.debug(`cleaning profile directory "${profileDir}"`); core.debug(`cleaning profile directory "${profileDir}"`);
@ -64662,7 +64661,6 @@ async function cleanBin() {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function cleanRegistry(packages) { async function cleanRegistry(packages) {
// `.cargo/registry/src` // `.cargo/registry/src`
@ -64674,16 +64672,14 @@ async function cleanRegistry(packages) {
if (dirent.isDirectory()) { if (dirent.isDirectory()) {
// eg `.cargo/registry/index/github.com-1ecc6299db9ec823` // eg `.cargo/registry/index/github.com-1ecc6299db9ec823`
// or `.cargo/registry/index/index.crates.io-e139d0d48fed7772` // or `.cargo/registry/index/index.crates.io-e139d0d48fed7772`
const dir = await external_fs_default().promises.opendir(external_path_default().join(indexDir.path, dirent.name)); const dirPath = external_path_default().join(indexDir.path, dirent.name);
// for a git registry, we can remove `.cache`, as cargo will recreate it from git // for a git registry, we can remove `.cache`, as cargo will recreate it from git
if (await exists(external_path_default().join(dir.path, ".git"))) { if (await exists(external_path_default().join(dirPath, ".git"))) {
await rmRF(external_path_default().join(dir.path, ".cache")); await rmRF(external_path_default().join(dirPath, ".cache"));
} }
await dir.close();
// TODO: else, clean `.cache` based on the `packages` // TODO: else, clean `.cache` based on the `packages`
} }
} }
await indexDir.close();
const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`)); const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`));
// `.cargo/registry/cache` // `.cargo/registry/cache`
const cacheDir = await external_fs_default().promises.opendir(external_path_default().join(CARGO_HOME, "registry", "cache")); const cacheDir = await external_fs_default().promises.opendir(external_path_default().join(CARGO_HOME, "registry", "cache"));
@ -64698,10 +64694,8 @@ async function cleanRegistry(packages) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
} }
await cacheDir.close();
} }
async function cleanGit(packages) { async function cleanGit(packages) {
const coPath = external_path_default().join(CARGO_HOME, "git", "checkouts"); const coPath = external_path_default().join(CARGO_HOME, "git", "checkouts");
@ -64730,7 +64724,6 @@ async function cleanGit(packages) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
catch { } catch { }
// clean the checkouts // clean the checkouts
@ -64751,9 +64744,7 @@ async function cleanGit(packages) {
await rm(refsDir.path, dirent); await rm(refsDir.path, dirent);
} }
} }
await refsDir.close();
} }
await dir.close();
} }
catch { } catch { }
} }
@ -64786,7 +64777,6 @@ async function rmExcept(dirName, keepPrefix, checkTimestamp = false) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function rm(parent, dirent) { async function rm(parent, dirent) {
try { try {

16
src/cleanup.ts
View file

@ -29,7 +29,6 @@ export async function cleanTargetDir(targetDir: string, packages: Packages, chec
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function cleanProfileTarget(profileDir: string, packages: Packages, checkTimestamp = false) { async function cleanProfileTarget(profileDir: string, packages: Packages, checkTimestamp = false) {
@ -84,7 +83,6 @@ export async function cleanBin() {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
export async function cleanRegistry(packages: Packages) { export async function cleanRegistry(packages: Packages) {
@ -98,17 +96,15 @@ export async function cleanRegistry(packages: Packages) {
if (dirent.isDirectory()) { if (dirent.isDirectory()) {
// eg `.cargo/registry/index/github.com-1ecc6299db9ec823` // eg `.cargo/registry/index/github.com-1ecc6299db9ec823`
// or `.cargo/registry/index/index.crates.io-e139d0d48fed7772` // or `.cargo/registry/index/index.crates.io-e139d0d48fed7772`
const dir = await fs.promises.opendir(path.join(indexDir.path, dirent.name)); const dirPath = path.join(indexDir.path, dirent.name);
// for a git registry, we can remove `.cache`, as cargo will recreate it from git // for a git registry, we can remove `.cache`, as cargo will recreate it from git
if (await exists(path.join(dir.path, ".git"))) { if (await exists(path.join(dirPath, ".git"))) {
await rmRF(path.join(dir.path, ".cache")); await rmRF(path.join(dirPath, ".cache"));
} }
await dir.close();
// TODO: else, clean `.cache` based on the `packages` // TODO: else, clean `.cache` based on the `packages`
} }
} }
await indexDir.close();
const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`)); const pkgSet = new Set(packages.map((p) => `${p.name}-${p.version}.crate`));
@ -125,10 +121,8 @@ export async function cleanRegistry(packages: Packages) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
} }
await cacheDir.close();
} }
export async function cleanGit(packages: Packages) { export async function cleanGit(packages: Packages) {
@ -159,7 +153,6 @@ export async function cleanGit(packages: Packages) {
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} catch {} } catch {}
// clean the checkouts // clean the checkouts
@ -180,9 +173,7 @@ export async function cleanGit(packages: Packages) {
await rm(refsDir.path, dirent); await rm(refsDir.path, dirent);
} }
} }
await refsDir.close();
} }
await dir.close();
} catch {} } catch {}
} }
@ -219,7 +210,6 @@ async function rmExcept(dirName: string, keepPrefix: Set<string>, checkTimestamp
await rm(dir.path, dirent); await rm(dir.path, dirent);
} }
} }
await dir.close();
} }
async function rm(parent: string, dirent: fs.Dirent) { async function rm(parent: string, dirent: fs.Dirent) {