diff --git a/Cargo.lock b/Cargo.lock index 80efa4d0..e6d9319e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -270,9 +270,9 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.12.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee685beed1fe2ab3cb9eb95d65727413b5e27f2b34014a3ea9c92053f8c230fc" +checksum = "6a621d5d6d6c8d086dbaf1fe659981da41a1b63c6bdbba30b4dbb592c6d3bd49" dependencies = [ "serde", "toml", diff --git a/crates/binstalk/Cargo.toml b/crates/binstalk/Cargo.toml index 48940b00..858a93ed 100644 --- a/crates/binstalk/Cargo.toml +++ b/crates/binstalk/Cargo.toml @@ -13,7 +13,7 @@ license = "GPL-3.0" async-trait = "0.1.57" bytes = "1.2.1" bzip2 = "0.4.3" -cargo_toml = "0.12.2" +cargo_toml = "0.12.4" compact_str = { version = "0.6.0", features = ["serde"] } crates_io_api = { version = "0.8.1", default-features = false } detect-targets = { version = "0.1.2", path = "../detect-targets" } diff --git a/crates/binstalk/src/ops/install.rs b/crates/binstalk/src/ops/install.rs index 973cd655..ea834d65 100644 --- a/crates/binstalk/src/ops/install.rs +++ b/crates/binstalk/src/ops/install.rs @@ -32,10 +32,10 @@ pub async fn install( } => { let current_version = package - .version + .version() .parse() .map_err(|err| BinstallError::VersionParse { - v: package.version, + v: package.version().to_string(), err, })?; let target = fetcher.target().into(); @@ -65,7 +65,8 @@ pub async fn install( } else { info!( "Dry-run: running `cargo install {} --version {} --target {target}`", - package.name, package.version + package.name, + package.version() ); Ok(None) } @@ -118,7 +119,7 @@ async fn install_from_source( "Running `{} install {} --version {} --target {target}`", cargo.to_string_lossy(), package.name, - package.version + package.version() ); let mut cmd = Command::new(cargo); @@ -126,7 +127,7 @@ async fn install_from_source( cmd.arg("install") .arg(&package.name) .arg("--version") - .arg(&package.version) + .arg(package.version()) .arg("--target") .arg(target); diff --git a/crates/binstalk/src/ops/resolve.rs b/crates/binstalk/src/ops/resolve.rs index 1e24d1fe..61b090e3 100644 --- a/crates/binstalk/src/ops/resolve.rs +++ b/crates/binstalk/src/ops/resolve.rs @@ -156,8 +156,8 @@ async fn resolve_inner( if let Some(curr_version) = curr_version { let new_version = - Version::parse(&package.version).map_err(|err| BinstallError::VersionParse { - v: package.version.clone(), + Version::parse(package.version()).map_err(|err| BinstallError::VersionParse { + v: package.version().to_string(), err, })?; @@ -206,8 +206,8 @@ async fn resolve_inner( Arc::new(Data { name: package.name.clone(), target: target.clone(), - version: package.version.clone(), - repo: package.repository.clone(), + version: package.version().to_string(), + repo: package.repository().map(ToString::to_string), meta: target_meta, }) }) @@ -383,8 +383,8 @@ fn collect_bin_files( let bin_data = bins::Data { name: &package.name, target: fetcher.target(), - version: &package.version, - repo: package.repository.as_deref(), + version: package.version(), + repo: package.repository(), meta, bin_path, install_path,