From a628cbf876b71c84b3ae76db665effcc4d8eeaae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Saparelli?= Date: Mon, 5 Sep 2022 03:28:22 +1200 Subject: [PATCH] Rename flock to fs-lock (#338) --- .github/workflows/release-pr.yml | 2 +- Cargo.lock | 16 ++++++++-------- Cargo.toml | 2 +- crates/{flock => fs-lock}/Cargo.toml | 4 ++-- crates/{flock => fs-lock}/LICENSE-APACHE | 0 crates/{flock => fs-lock}/LICENSE-MIT | 0 crates/{flock => fs-lock}/src/lib.rs | 0 crates/lib/Cargo.toml | 2 +- crates/lib/src/fetchers/gh_crate_meta.rs | 2 +- crates/lib/src/manifests/binstall_crates_v1.rs | 2 +- crates/lib/src/manifests/cargo_crates_v1.rs | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) rename crates/{flock => fs-lock}/Cargo.toml (83%) rename crates/{flock => fs-lock}/LICENSE-APACHE (100%) rename crates/{flock => fs-lock}/LICENSE-MIT (100%) rename crates/{flock => fs-lock}/src/lib.rs (100%) diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index e47a148e..d7066ed3 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -11,7 +11,7 @@ on: - lib - detect-targets - detect-wasi - - flock + - fs-lock - normalize-path version: description: Version to release diff --git a/Cargo.lock b/Cargo.lock index 535fa8a9..23732f54 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ dependencies = [ "digest", "env_logger", "flate2", - "flock", + "fs-lock", "futures-util", "generic-array", "home", @@ -530,13 +530,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flock" -version = "0.0.0" -dependencies = [ - "fs4", -] - [[package]] name = "fnv" version = "1.0.7" @@ -568,6 +561,13 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-lock" +version = "0.0.0" +dependencies = [ + "fs4", +] + [[package]] name = "fs4" version = "0.6.2" diff --git a/Cargo.toml b/Cargo.toml index 0e1c817a..d9372896 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "crates/bin", "crates/lib", "crates/detect-wasi", - "crates/flock", + "crates/fs-lock", "crates/normalize-path", "crates/detect-targets", ] diff --git a/crates/flock/Cargo.toml b/crates/fs-lock/Cargo.toml similarity index 83% rename from crates/flock/Cargo.toml rename to crates/fs-lock/Cargo.toml index 61461a48..2e84efcc 100644 --- a/crates/flock/Cargo.toml +++ b/crates/fs-lock/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "flock" +name = "fs-lock" description = "Locked files that can be used like normal File" repository = "https://github.com/cargo-bins/cargo-binstall" -documentation = "https://docs.rs/flock" +documentation = "https://docs.rs/fs-lock" version = "0.0.0" rust-version = "1.61.0" authors = ["Jiahao XU "] diff --git a/crates/flock/LICENSE-APACHE b/crates/fs-lock/LICENSE-APACHE similarity index 100% rename from crates/flock/LICENSE-APACHE rename to crates/fs-lock/LICENSE-APACHE diff --git a/crates/flock/LICENSE-MIT b/crates/fs-lock/LICENSE-MIT similarity index 100% rename from crates/flock/LICENSE-MIT rename to crates/fs-lock/LICENSE-MIT diff --git a/crates/flock/src/lib.rs b/crates/fs-lock/src/lib.rs similarity index 100% rename from crates/flock/src/lib.rs rename to crates/fs-lock/src/lib.rs diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml index 1905aec9..896c502b 100644 --- a/crates/lib/Cargo.toml +++ b/crates/lib/Cargo.toml @@ -20,7 +20,7 @@ crates_io_api = { version = "0.8.0", default-features = false } detect-targets = { version = "0.1.0", path = "../detect-targets" } digest = "0.10.3" flate2 = { version = "1.0.24", default-features = false } -flock = { version = "0.0.0", path = "../flock" } +fs-lock = { version = "0.0.0", path = "../fs-lock" } futures-util = { version = "0.3.23", default-features = false, features = ["std"] } generic-array = "0.14.6" home = "0.5.3" diff --git a/crates/lib/src/fetchers/gh_crate_meta.rs b/crates/lib/src/fetchers/gh_crate_meta.rs index dea1877e..eb36b6e9 100644 --- a/crates/lib/src/fetchers/gh_crate_meta.rs +++ b/crates/lib/src/fetchers/gh_crate_meta.rs @@ -143,7 +143,7 @@ impl super::Fetcher for GhCrateMeta { } async fn fetch_and_extract(&self, dst: &Path) -> Result<(), BinstallError> { - let (url, pkg_fmt) = self.resolution.get().unwrap(); // find() is called first + let (url, _pkg_fmt) = self.resolution.get().unwrap(); // find() is called first debug!("Downloading package from: '{url}'"); Download::new(self.client.clone(), url.clone()) .and_extract(self.pkg_fmt(), dst) diff --git a/crates/lib/src/manifests/binstall_crates_v1.rs b/crates/lib/src/manifests/binstall_crates_v1.rs index 78b9ab02..c343bc23 100644 --- a/crates/lib/src/manifests/binstall_crates_v1.rs +++ b/crates/lib/src/manifests/binstall_crates_v1.rs @@ -14,7 +14,7 @@ use std::{ path::{Path, PathBuf}, }; -use flock::FileLock; +use fs_lock::FileLock; use miette::Diagnostic; use serde::Serialize; use thiserror::Error; diff --git a/crates/lib/src/manifests/cargo_crates_v1.rs b/crates/lib/src/manifests/cargo_crates_v1.rs index 2f9b8296..5b2ca110 100644 --- a/crates/lib/src/manifests/cargo_crates_v1.rs +++ b/crates/lib/src/manifests/cargo_crates_v1.rs @@ -16,7 +16,7 @@ use std::{ }; use compact_str::CompactString; -use flock::FileLock; +use fs_lock::FileLock; use miette::Diagnostic; use serde::{Deserialize, Serialize}; use thiserror::Error;