diff --git a/crates/bin/src/args.rs b/crates/bin/src/args.rs index b2e4f60d..10243723 100644 --- a/crates/bin/src/args.rs +++ b/crates/bin/src/args.rs @@ -102,7 +102,7 @@ pub struct Args { /// /// This option cannot be used with `--manifest-path`. #[clap(help_heading = "Overrides", long, conflicts_with("manifest_path"))] - pub git: Option, + pub git: Option, /// Override Cargo.toml package manifest bin-dir. #[clap(help_heading = "Overrides", long)] diff --git a/crates/binstalk/src/drivers.rs b/crates/binstalk/src/drivers.rs index 1f07c099..15604fea 100644 --- a/crates/binstalk/src/drivers.rs +++ b/crates/binstalk/src/drivers.rs @@ -5,4 +5,4 @@ pub use registry::{ }; #[cfg(feature = "git")] -pub use registry::GitRegistry; +pub use registry::{GitRegistry, GitUrl, GitUrlParseError}; diff --git a/crates/binstalk/src/drivers/registry.rs b/crates/binstalk/src/drivers/registry.rs index 7938d98a..ebc67a6f 100644 --- a/crates/binstalk/src/drivers/registry.rs +++ b/crates/binstalk/src/drivers/registry.rs @@ -15,7 +15,7 @@ use crate::{ }; #[cfg(feature = "git")] -use crate::helpers::git::{GitUrl, GitUrlParseError}; +pub use crate::helpers::git::{GitUrl, GitUrlParseError}; mod vfs; diff --git a/crates/binstalk/src/helpers.rs b/crates/binstalk/src/helpers.rs index 34da60e0..723cb724 100644 --- a/crates/binstalk/src/helpers.rs +++ b/crates/binstalk/src/helpers.rs @@ -1,15 +1,16 @@ -pub mod cargo_toml_workspace; -pub mod futures_resolver; +pub(crate) mod cargo_toml_workspace; +pub(crate) mod futures_resolver; #[cfg(feature = "git")] -pub mod git; +pub(crate) mod git; pub mod jobserver_client; pub mod remote; pub mod signal; -pub mod target_triple; +pub(crate) mod target_triple; pub mod tasks; -pub use binstalk_downloader::{download, gh_api_client}; +pub(crate) use binstalk_downloader::download; +pub use binstalk_downloader::gh_api_client; -pub fn is_universal_macos(target: &str) -> bool { +pub(crate) fn is_universal_macos(target: &str) -> bool { ["universal-apple-darwin", "universal2-apple-darwin"].contains(&target) } diff --git a/crates/binstalk/src/lib.rs b/crates/binstalk/src/lib.rs index e1b64b89..e36c14e7 100644 --- a/crates/binstalk/src/lib.rs +++ b/crates/binstalk/src/lib.rs @@ -4,7 +4,7 @@ pub mod bins; pub mod drivers; pub mod errors; pub mod fetchers; -pub mod fs; +pub(crate) mod fs; pub mod helpers; pub mod ops;