From e25aa50ec930d1f5b926d20842c8e717da93e79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Saparelli?= Date: Sat, 10 Sep 2022 18:44:18 +1200 Subject: [PATCH] Rename lib to binstalk (#361) --- .github/dependabot.yml | 8 ++++---- Cargo.lock | 4 ++-- Cargo.toml | 2 +- crates/bin/Cargo.toml | 14 +++++++------- crates/bin/src/args.rs | 2 +- crates/bin/src/bin_util.rs | 4 ++-- crates/bin/src/entry.rs | 2 +- crates/bin/src/install_path.rs | 2 +- crates/bin/src/main.rs | 2 +- crates/bin/src/ui.rs | 2 +- crates/{lib => binstalk}/Cargo.toml | 6 +++--- crates/{lib => binstalk}/LICENSE | 0 crates/{lib => binstalk}/src/bins.rs | 0 crates/{lib => binstalk}/src/drivers.rs | 0 crates/{lib => binstalk}/src/drivers/crates_io.rs | 0 .../{lib => binstalk}/src/drivers/crates_io/vfs.rs | 0 .../src/drivers/crates_io/visitor.rs | 0 crates/{lib => binstalk}/src/drivers/version.rs | 0 crates/{lib => binstalk}/src/errors.rs | 0 crates/{lib => binstalk}/src/fetchers.rs | 0 .../src/fetchers/gh_crate_meta.rs | 0 .../src/fetchers/gh_crate_meta/hosting.rs | 0 .../{lib => binstalk}/src/fetchers/quickinstall.rs | 0 crates/{lib => binstalk}/src/fs.rs | 0 crates/{lib => binstalk}/src/helpers.rs | 0 crates/{lib => binstalk}/src/helpers/download.rs | 0 .../src/helpers/download/async_extracter.rs | 0 .../src/helpers/download/extracter.rs | 0 .../src/helpers/download/stream_readable.rs | 0 .../src/helpers/jobserver_client.rs | 0 crates/{lib => binstalk}/src/helpers/remote.rs | 0 crates/{lib => binstalk}/src/helpers/signal.rs | 0 crates/{lib => binstalk}/src/helpers/statics.rs | 0 crates/{lib => binstalk}/src/helpers/tasks.rs | 0 crates/{lib => binstalk}/src/lib.rs | 0 crates/{lib => binstalk}/src/manifests.rs | 0 .../src/manifests/binstall_crates_v1.rs | 0 .../src/manifests/cargo_crates_v1.rs | 0 .../cargo_crates_v1/crate_version_source.rs | 0 .../src/manifests/cargo_toml_binstall.rs | 0 .../cargo_toml_binstall/package_formats.rs | 0 .../{lib => binstalk}/src/manifests/crate_info.rs | 0 crates/{lib => binstalk}/src/ops.rs | 0 crates/{lib => binstalk}/src/ops/install.rs | 0 crates/{lib => binstalk}/src/ops/resolve.rs | 0 .../src/ops/resolve/crate_name.rs | 0 .../src/ops/resolve/version_ext.rs | 0 .../{lib => binstalk}/tests/parse-meta.Cargo.toml | 0 crates/{lib => binstalk}/tests/parse-meta.rs | 2 +- 49 files changed, 25 insertions(+), 25 deletions(-) rename crates/{lib => binstalk}/Cargo.toml (96%) rename crates/{lib => binstalk}/LICENSE (100%) rename crates/{lib => binstalk}/src/bins.rs (100%) rename crates/{lib => binstalk}/src/drivers.rs (100%) rename crates/{lib => binstalk}/src/drivers/crates_io.rs (100%) rename crates/{lib => binstalk}/src/drivers/crates_io/vfs.rs (100%) rename crates/{lib => binstalk}/src/drivers/crates_io/visitor.rs (100%) rename crates/{lib => binstalk}/src/drivers/version.rs (100%) rename crates/{lib => binstalk}/src/errors.rs (100%) rename crates/{lib => binstalk}/src/fetchers.rs (100%) rename crates/{lib => binstalk}/src/fetchers/gh_crate_meta.rs (100%) rename crates/{lib => binstalk}/src/fetchers/gh_crate_meta/hosting.rs (100%) rename crates/{lib => binstalk}/src/fetchers/quickinstall.rs (100%) rename crates/{lib => binstalk}/src/fs.rs (100%) rename crates/{lib => binstalk}/src/helpers.rs (100%) rename crates/{lib => binstalk}/src/helpers/download.rs (100%) rename crates/{lib => binstalk}/src/helpers/download/async_extracter.rs (100%) rename crates/{lib => binstalk}/src/helpers/download/extracter.rs (100%) rename crates/{lib => binstalk}/src/helpers/download/stream_readable.rs (100%) rename crates/{lib => binstalk}/src/helpers/jobserver_client.rs (100%) rename crates/{lib => binstalk}/src/helpers/remote.rs (100%) rename crates/{lib => binstalk}/src/helpers/signal.rs (100%) rename crates/{lib => binstalk}/src/helpers/statics.rs (100%) rename crates/{lib => binstalk}/src/helpers/tasks.rs (100%) rename crates/{lib => binstalk}/src/lib.rs (100%) rename crates/{lib => binstalk}/src/manifests.rs (100%) rename crates/{lib => binstalk}/src/manifests/binstall_crates_v1.rs (100%) rename crates/{lib => binstalk}/src/manifests/cargo_crates_v1.rs (100%) rename crates/{lib => binstalk}/src/manifests/cargo_crates_v1/crate_version_source.rs (100%) rename crates/{lib => binstalk}/src/manifests/cargo_toml_binstall.rs (100%) rename crates/{lib => binstalk}/src/manifests/cargo_toml_binstall/package_formats.rs (100%) rename crates/{lib => binstalk}/src/manifests/crate_info.rs (100%) rename crates/{lib => binstalk}/src/ops.rs (100%) rename crates/{lib => binstalk}/src/ops/install.rs (100%) rename crates/{lib => binstalk}/src/ops/resolve.rs (100%) rename crates/{lib => binstalk}/src/ops/resolve/crate_name.rs (100%) rename crates/{lib => binstalk}/src/ops/resolve/version_ext.rs (100%) rename crates/{lib => binstalk}/tests/parse-meta.Cargo.toml (100%) rename crates/{lib => binstalk}/tests/parse-meta.rs (95%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index f0420247..a3c3b0d1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -12,6 +12,10 @@ updates: directory: "/crates/bin" schedule: interval: "daily" + - package-ecosystem: "cargo" + directory: "/crates/binstalk" + schedule: + interval: "daily" - package-ecosystem: "cargo" directory: "/crates/detect-wasi" schedule: @@ -20,10 +24,6 @@ updates: directory: "/crates/flock" schedule: interval: "daily" - - package-ecosystem: "cargo" - directory: "/crates/lib" - schedule: - interval: "daily" - package-ecosystem: "cargo" directory: "/crates/normalize-path" schedule: diff --git a/Cargo.lock b/Cargo.lock index e41a4558..0ab0f17f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,7 +76,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] -name = "binstall" +name = "binstalk" version = "0.0.0" dependencies = [ "async-trait", @@ -190,7 +190,7 @@ dependencies = [ name = "cargo-binstall" version = "0.12.0" dependencies = [ - "binstall", + "binstalk", "clap", "crates_io_api", "dirs", diff --git a/Cargo.toml b/Cargo.toml index d9372896..8f00a464 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "crates/bin", - "crates/lib", + "crates/binstalk", "crates/detect-wasi", "crates/fs-lock", "crates/normalize-path", diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml index 182b92f4..1efcad6e 100644 --- a/crates/bin/Cargo.toml +++ b/crates/bin/Cargo.toml @@ -18,7 +18,7 @@ pkg-fmt = "zip" pkg-fmt = "zip" [dependencies] -binstall = { path = "../lib", version = "0.0.0" } +binstalk = { path = "../binstalk", version = "0.0.0" } clap = { version = "3.2.17", features = ["derive"] } crates_io_api = { version = "0.8.1", default-features = false } dirs = "4.0.0" @@ -39,15 +39,15 @@ default = ["static", "rustls", "trust-dns", "fancy-no-backtrace"] mimalloc = ["dep:mimalloc"] -static = ["binstall/static"] -pkg-config = ["binstall/pkg-config"] +static = ["binstalk/static"] +pkg-config = ["binstalk/pkg-config"] -zlib-ng = ["binstall/zlib-ng"] +zlib-ng = ["binstalk/zlib-ng"] -rustls = ["binstall/rustls"] -native-tls = ["binstall/native-tls"] +rustls = ["binstalk/rustls"] +native-tls = ["binstalk/native-tls"] -trust-dns = ["binstall/trust-dns"] +trust-dns = ["binstalk/trust-dns"] fancy-no-backtrace = ["miette/fancy-no-backtrace"] fancy-with-backtrace = ["fancy-no-backtrace", "miette/fancy"] diff --git a/crates/bin/src/args.rs b/crates/bin/src/args.rs index f1cd7cbd..af897419 100644 --- a/crates/bin/src/args.rs +++ b/crates/bin/src/args.rs @@ -1,6 +1,6 @@ use std::{ffi::OsString, path::PathBuf}; -use binstall::{ +use binstalk::{ errors::BinstallError, manifests::cargo_toml_binstall::PkgFmt, ops::resolve::{CrateName, VersionReqExt}, diff --git a/crates/bin/src/bin_util.rs b/crates/bin/src/bin_util.rs index 783d8419..7a85ad0b 100644 --- a/crates/bin/src/bin_util.rs +++ b/crates/bin/src/bin_util.rs @@ -4,8 +4,8 @@ use std::{ time::Duration, }; -use binstall::errors::BinstallError; -use binstall::helpers::{signal::cancel_on_user_sig_term, tasks::AutoAbortJoinHandle}; +use binstalk::errors::BinstallError; +use binstalk::helpers::{signal::cancel_on_user_sig_term, tasks::AutoAbortJoinHandle}; use log::{error, info}; use miette::Result; use tokio::runtime::Runtime; diff --git a/crates/bin/src/entry.rs b/crates/bin/src/entry.rs index e97853fe..e878bfeb 100644 --- a/crates/bin/src/entry.rs +++ b/crates/bin/src/entry.rs @@ -1,6 +1,6 @@ use std::{fs, path::Path, sync::Arc, time::Duration}; -use binstall::{ +use binstalk::{ errors::BinstallError, get_desired_targets, helpers::{ diff --git a/crates/bin/src/install_path.rs b/crates/bin/src/install_path.rs index a64f6260..a979ff77 100644 --- a/crates/bin/src/install_path.rs +++ b/crates/bin/src/install_path.rs @@ -3,7 +3,7 @@ use std::{ sync::Arc, }; -use binstall::helpers::statics::cargo_home; +use binstalk::helpers::statics::cargo_home; use log::debug; /// Fetch install path from environment diff --git a/crates/bin/src/main.rs b/crates/bin/src/main.rs index 374233de..d7312502 100644 --- a/crates/bin/src/main.rs +++ b/crates/bin/src/main.rs @@ -1,6 +1,6 @@ use std::time::Instant; -use binstall::helpers::jobserver_client::LazyJobserverClient; +use binstalk::helpers::jobserver_client::LazyJobserverClient; use log::debug; use cargo_binstall::{ diff --git a/crates/bin/src/ui.rs b/crates/bin/src/ui.rs index 889df09d..7e6e893a 100644 --- a/crates/bin/src/ui.rs +++ b/crates/bin/src/ui.rs @@ -7,7 +7,7 @@ use log::LevelFilter; use simplelog::{ColorChoice, ConfigBuilder, TermLogger, TerminalMode}; use tokio::sync::mpsc; -use binstall::errors::BinstallError; +use binstalk::errors::BinstallError; use crate::args::Args; diff --git a/crates/lib/Cargo.toml b/crates/binstalk/Cargo.toml similarity index 96% rename from crates/lib/Cargo.toml rename to crates/binstalk/Cargo.toml index 91fec39b..6a8ba3c7 100644 --- a/crates/lib/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -1,8 +1,8 @@ [package] -name = "binstall" -description = "Library backend for cargo-binstall" +name = "binstalk" +description = "The binstall toolkit (library interface)" repository = "https://github.com/cargo-bins/cargo-binstall" -documentation = "https://docs.rs/binstall" +documentation = "https://docs.rs/binstalk" version = "0.0.0" rust-version = "1.61.0" authors = ["ryan "] diff --git a/crates/lib/LICENSE b/crates/binstalk/LICENSE similarity index 100% rename from crates/lib/LICENSE rename to crates/binstalk/LICENSE diff --git a/crates/lib/src/bins.rs b/crates/binstalk/src/bins.rs similarity index 100% rename from crates/lib/src/bins.rs rename to crates/binstalk/src/bins.rs diff --git a/crates/lib/src/drivers.rs b/crates/binstalk/src/drivers.rs similarity index 100% rename from crates/lib/src/drivers.rs rename to crates/binstalk/src/drivers.rs diff --git a/crates/lib/src/drivers/crates_io.rs b/crates/binstalk/src/drivers/crates_io.rs similarity index 100% rename from crates/lib/src/drivers/crates_io.rs rename to crates/binstalk/src/drivers/crates_io.rs diff --git a/crates/lib/src/drivers/crates_io/vfs.rs b/crates/binstalk/src/drivers/crates_io/vfs.rs similarity index 100% rename from crates/lib/src/drivers/crates_io/vfs.rs rename to crates/binstalk/src/drivers/crates_io/vfs.rs diff --git a/crates/lib/src/drivers/crates_io/visitor.rs b/crates/binstalk/src/drivers/crates_io/visitor.rs similarity index 100% rename from crates/lib/src/drivers/crates_io/visitor.rs rename to crates/binstalk/src/drivers/crates_io/visitor.rs diff --git a/crates/lib/src/drivers/version.rs b/crates/binstalk/src/drivers/version.rs similarity index 100% rename from crates/lib/src/drivers/version.rs rename to crates/binstalk/src/drivers/version.rs diff --git a/crates/lib/src/errors.rs b/crates/binstalk/src/errors.rs similarity index 100% rename from crates/lib/src/errors.rs rename to crates/binstalk/src/errors.rs diff --git a/crates/lib/src/fetchers.rs b/crates/binstalk/src/fetchers.rs similarity index 100% rename from crates/lib/src/fetchers.rs rename to crates/binstalk/src/fetchers.rs diff --git a/crates/lib/src/fetchers/gh_crate_meta.rs b/crates/binstalk/src/fetchers/gh_crate_meta.rs similarity index 100% rename from crates/lib/src/fetchers/gh_crate_meta.rs rename to crates/binstalk/src/fetchers/gh_crate_meta.rs diff --git a/crates/lib/src/fetchers/gh_crate_meta/hosting.rs b/crates/binstalk/src/fetchers/gh_crate_meta/hosting.rs similarity index 100% rename from crates/lib/src/fetchers/gh_crate_meta/hosting.rs rename to crates/binstalk/src/fetchers/gh_crate_meta/hosting.rs diff --git a/crates/lib/src/fetchers/quickinstall.rs b/crates/binstalk/src/fetchers/quickinstall.rs similarity index 100% rename from crates/lib/src/fetchers/quickinstall.rs rename to crates/binstalk/src/fetchers/quickinstall.rs diff --git a/crates/lib/src/fs.rs b/crates/binstalk/src/fs.rs similarity index 100% rename from crates/lib/src/fs.rs rename to crates/binstalk/src/fs.rs diff --git a/crates/lib/src/helpers.rs b/crates/binstalk/src/helpers.rs similarity index 100% rename from crates/lib/src/helpers.rs rename to crates/binstalk/src/helpers.rs diff --git a/crates/lib/src/helpers/download.rs b/crates/binstalk/src/helpers/download.rs similarity index 100% rename from crates/lib/src/helpers/download.rs rename to crates/binstalk/src/helpers/download.rs diff --git a/crates/lib/src/helpers/download/async_extracter.rs b/crates/binstalk/src/helpers/download/async_extracter.rs similarity index 100% rename from crates/lib/src/helpers/download/async_extracter.rs rename to crates/binstalk/src/helpers/download/async_extracter.rs diff --git a/crates/lib/src/helpers/download/extracter.rs b/crates/binstalk/src/helpers/download/extracter.rs similarity index 100% rename from crates/lib/src/helpers/download/extracter.rs rename to crates/binstalk/src/helpers/download/extracter.rs diff --git a/crates/lib/src/helpers/download/stream_readable.rs b/crates/binstalk/src/helpers/download/stream_readable.rs similarity index 100% rename from crates/lib/src/helpers/download/stream_readable.rs rename to crates/binstalk/src/helpers/download/stream_readable.rs diff --git a/crates/lib/src/helpers/jobserver_client.rs b/crates/binstalk/src/helpers/jobserver_client.rs similarity index 100% rename from crates/lib/src/helpers/jobserver_client.rs rename to crates/binstalk/src/helpers/jobserver_client.rs diff --git a/crates/lib/src/helpers/remote.rs b/crates/binstalk/src/helpers/remote.rs similarity index 100% rename from crates/lib/src/helpers/remote.rs rename to crates/binstalk/src/helpers/remote.rs diff --git a/crates/lib/src/helpers/signal.rs b/crates/binstalk/src/helpers/signal.rs similarity index 100% rename from crates/lib/src/helpers/signal.rs rename to crates/binstalk/src/helpers/signal.rs diff --git a/crates/lib/src/helpers/statics.rs b/crates/binstalk/src/helpers/statics.rs similarity index 100% rename from crates/lib/src/helpers/statics.rs rename to crates/binstalk/src/helpers/statics.rs diff --git a/crates/lib/src/helpers/tasks.rs b/crates/binstalk/src/helpers/tasks.rs similarity index 100% rename from crates/lib/src/helpers/tasks.rs rename to crates/binstalk/src/helpers/tasks.rs diff --git a/crates/lib/src/lib.rs b/crates/binstalk/src/lib.rs similarity index 100% rename from crates/lib/src/lib.rs rename to crates/binstalk/src/lib.rs diff --git a/crates/lib/src/manifests.rs b/crates/binstalk/src/manifests.rs similarity index 100% rename from crates/lib/src/manifests.rs rename to crates/binstalk/src/manifests.rs diff --git a/crates/lib/src/manifests/binstall_crates_v1.rs b/crates/binstalk/src/manifests/binstall_crates_v1.rs similarity index 100% rename from crates/lib/src/manifests/binstall_crates_v1.rs rename to crates/binstalk/src/manifests/binstall_crates_v1.rs diff --git a/crates/lib/src/manifests/cargo_crates_v1.rs b/crates/binstalk/src/manifests/cargo_crates_v1.rs similarity index 100% rename from crates/lib/src/manifests/cargo_crates_v1.rs rename to crates/binstalk/src/manifests/cargo_crates_v1.rs diff --git a/crates/lib/src/manifests/cargo_crates_v1/crate_version_source.rs b/crates/binstalk/src/manifests/cargo_crates_v1/crate_version_source.rs similarity index 100% rename from crates/lib/src/manifests/cargo_crates_v1/crate_version_source.rs rename to crates/binstalk/src/manifests/cargo_crates_v1/crate_version_source.rs diff --git a/crates/lib/src/manifests/cargo_toml_binstall.rs b/crates/binstalk/src/manifests/cargo_toml_binstall.rs similarity index 100% rename from crates/lib/src/manifests/cargo_toml_binstall.rs rename to crates/binstalk/src/manifests/cargo_toml_binstall.rs diff --git a/crates/lib/src/manifests/cargo_toml_binstall/package_formats.rs b/crates/binstalk/src/manifests/cargo_toml_binstall/package_formats.rs similarity index 100% rename from crates/lib/src/manifests/cargo_toml_binstall/package_formats.rs rename to crates/binstalk/src/manifests/cargo_toml_binstall/package_formats.rs diff --git a/crates/lib/src/manifests/crate_info.rs b/crates/binstalk/src/manifests/crate_info.rs similarity index 100% rename from crates/lib/src/manifests/crate_info.rs rename to crates/binstalk/src/manifests/crate_info.rs diff --git a/crates/lib/src/ops.rs b/crates/binstalk/src/ops.rs similarity index 100% rename from crates/lib/src/ops.rs rename to crates/binstalk/src/ops.rs diff --git a/crates/lib/src/ops/install.rs b/crates/binstalk/src/ops/install.rs similarity index 100% rename from crates/lib/src/ops/install.rs rename to crates/binstalk/src/ops/install.rs diff --git a/crates/lib/src/ops/resolve.rs b/crates/binstalk/src/ops/resolve.rs similarity index 100% rename from crates/lib/src/ops/resolve.rs rename to crates/binstalk/src/ops/resolve.rs diff --git a/crates/lib/src/ops/resolve/crate_name.rs b/crates/binstalk/src/ops/resolve/crate_name.rs similarity index 100% rename from crates/lib/src/ops/resolve/crate_name.rs rename to crates/binstalk/src/ops/resolve/crate_name.rs diff --git a/crates/lib/src/ops/resolve/version_ext.rs b/crates/binstalk/src/ops/resolve/version_ext.rs similarity index 100% rename from crates/lib/src/ops/resolve/version_ext.rs rename to crates/binstalk/src/ops/resolve/version_ext.rs diff --git a/crates/lib/tests/parse-meta.Cargo.toml b/crates/binstalk/tests/parse-meta.Cargo.toml similarity index 100% rename from crates/lib/tests/parse-meta.Cargo.toml rename to crates/binstalk/tests/parse-meta.Cargo.toml diff --git a/crates/lib/tests/parse-meta.rs b/crates/binstalk/tests/parse-meta.rs similarity index 95% rename from crates/lib/tests/parse-meta.rs rename to crates/binstalk/tests/parse-meta.rs index 4517943c..33ad6dff 100644 --- a/crates/lib/tests/parse-meta.rs +++ b/crates/binstalk/tests/parse-meta.rs @@ -1,4 +1,4 @@ -use binstall::ops::resolve::load_manifest_path; +use binstalk::ops::resolve::load_manifest_path; use cargo_toml::Product; #[test]