actions/cargo-binstall
1
0
Fork 0
mirror of https://github.com/cargo-bins/cargo-binstall.git synced 2025-04-22 13:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

feat: Add more variables for template (#1160)

Browse source 
Fixed #775

 - Add dep target-lexicon v0.12.7
 - Add `target-{family, arch, libc, vendor}` to
   `package.metadata.binstall`.

For `{universal, universal2}-apple-darwin`, the `target-arch` is set to
`universal`.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2023-06-21 08:05:13 +10:00 • committed by GitHub
parent 181b5293e7
commit d8419ea5a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 210 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Cargo.lock generated
View file

@ -238,6 +238,7 @@ dependencies = [
"semver", "semver",
"serde", "serde",
"strum", "strum",
"target-lexicon",
"tempfile", "tempfile",
"thiserror", "thiserror",
"tokio", "tokio",
@ -2237,6 +2238,12 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "target-lexicon"
version = "0.12.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
[[package]] [[package]]
name = "tempfile" name = "tempfile"
version = "3.6.0" version = "3.6.0"

1
crates/binstalk/Cargo.toml
View file

@ -30,6 +30,7 @@ once_cell = "1.18.0"
semver = { version = "1.0.17", features = ["serde"] } semver = { version = "1.0.17", features = ["serde"] }
serde = { version = "1.0.163", features = ["derive"] } serde = { version = "1.0.163", features = ["derive"] }
strum = "0.25.0" strum = "0.25.0"
target-lexicon = { version = "0.12.7", features = ["std"] }
tempfile = "3.5.0" tempfile = "3.5.0"
thiserror = "1.0.40" thiserror = "1.0.40"
# parking_lot for `tokio::sync::OnceCell::const_new` # parking_lot for `tokio::sync::OnceCell::const_new`

10
crates/binstalk/src/bins.rs
View file

@ -15,7 +15,7 @@ use crate::{
atomic_install, atomic_install_noclobber, atomic_symlink_file, atomic_install, atomic_install_noclobber, atomic_symlink_file,
atomic_symlink_file_noclobber, atomic_symlink_file_noclobber,
}, },
helpers::download::ExtractedFiles, helpers::{download::ExtractedFiles, target_triple::TargetTriple},
manifests::cargo_toml_binstall::{PkgFmt, PkgMeta}, manifests::cargo_toml_binstall::{PkgFmt, PkgMeta},
}; };
@ -98,6 +98,8 @@ impl BinFile {
version: data.version, version: data.version,
bin: base_name, bin: base_name,
binary_ext, binary_ext,
triple: data.triple,
}; };
let (source, archive_source_path) = if data.meta.pkg_fmt == Some(PkgFmt::Bin) { let (source, archive_source_path) = if data.meta.pkg_fmt == Some(PkgFmt::Bin) {
@ -271,6 +273,7 @@ pub struct Data<'a> {
pub meta: PkgMeta, pub meta: PkgMeta,
pub bin_path: &'a Path, pub bin_path: &'a Path,
pub install_path: &'a Path, pub install_path: &'a Path,
pub triple: &'a TargetTriple,
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -283,6 +286,8 @@ struct Context<'c> {
/// Filename extension on the binary, i.e. .exe on Windows, nothing otherwise /// Filename extension on the binary, i.e. .exe on Windows, nothing otherwise
pub binary_ext: &'c str, pub binary_ext: &'c str,
pub triple: &'c TargetTriple,
} }
impl leon::Values for Context<'_> { impl leon::Values for Context<'_> {
@ -296,7 +301,8 @@ impl leon::Values for Context<'_> {
"binary-ext" => Some(Cow::Borrowed(self.binary_ext)), "binary-ext" => Some(Cow::Borrowed(self.binary_ext)),
// Soft-deprecated alias for binary-ext // Soft-deprecated alias for binary-ext
"format" => Some(Cow::Borrowed(self.binary_ext)), "format" => Some(Cow::Borrowed(self.binary_ext)),
_ => None,
key => self.triple.get_value(key),
} }
} }
} }

16
crates/binstalk/src/errors.rs
View file

@ -10,6 +10,7 @@ use binstalk_downloader::{
use cargo_toml::Error as CargoTomlError; use cargo_toml::Error as CargoTomlError;
use compact_str::CompactString; use compact_str::CompactString;
use miette::{Diagnostic, Report}; use miette::{Diagnostic, Report};
use target_lexicon::ParseError as TargetTripleParseError;
use thiserror::Error; use thiserror::Error;
use tokio::task; use tokio::task;
use tracing::{error, warn}; use tracing::{error, warn};
@ -314,6 +315,14 @@ pub enum BinstallError {
#[diagnostic(severity(error), code(binstall::gh_api_failure))] #[diagnostic(severity(error), code(binstall::gh_api_failure))]
GhApiErr(#[source] Box<GhApiError>), GhApiErr(#[source] Box<GhApiError>),
/// Failed to parse target triple
///
/// - Code: `binstall::target_triple_parse_error`
/// - Exit: 97
#[error("Failed to parse target triple: {0}")]
#[diagnostic(severity(error), code(binstall::target_triple_parse_error))]
TargetTripleParseError(#[source] Box<TargetTripleParseError>),
/// A wrapped error providing the context of which crate the error is about. /// A wrapped error providing the context of which crate the error is about.
#[error(transparent)] #[error(transparent)]
#[diagnostic(transparent)] #[diagnostic(transparent)]
@ -348,6 +357,7 @@ impl BinstallError {
NoFallbackToCargoInstall => 94, NoFallbackToCargoInstall => 94,
InvalidPkgFmt(..) => 95, InvalidPkgFmt(..) => 95,
GhApiErr(..) => 96, GhApiErr(..) => 96,
TargetTripleParseError(..) => 97,
CrateContext(context) => context.err.exit_number(), CrateContext(context) => context.err.exit_number(),
}; };
@ -441,3 +451,9 @@ impl From<GhApiError> for BinstallError {
BinstallError::GhApiErr(Box::new(e)) BinstallError::GhApiErr(Box::new(e))
} }
} }
impl From<target_lexicon::ParseError> for BinstallError {
fn from(e: target_lexicon::ParseError) -> Self {
BinstallError::TargetTripleParseError(Box::new(e))
}
}

5
crates/binstalk/src/fetchers.rs
View file

@ -11,7 +11,7 @@ use crate::{
errors::BinstallError, errors::BinstallError,
helpers::{ helpers::{
download::ExtractedFiles, gh_api_client::GhApiClient, remote::Client, download::ExtractedFiles, gh_api_client::GhApiClient, remote::Client,
tasks::AutoAbortJoinHandle, target_triple::TargetTriple, tasks::AutoAbortJoinHandle,
}, },
manifests::cargo_toml_binstall::{PkgFmt, PkgMeta}, manifests::cargo_toml_binstall::{PkgFmt, PkgMeta},
}; };
@ -72,6 +72,8 @@ pub trait Fetcher: Send + Sync {
/// Return the target for this fetcher /// Return the target for this fetcher
fn target(&self) -> &str; fn target(&self) -> &str;
fn target_data(&self) -> &Arc<TargetData>;
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
@ -186,6 +188,7 @@ impl RepoInfo {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct TargetData { pub struct TargetData {
pub target: String, pub target: String,
pub triple: TargetTriple,
pub meta: PkgMeta, pub meta: PkgMeta,
} }

165
crates/binstalk/src/fetchers/gh_crate_meta.rs
View file

@ -15,6 +15,7 @@ use crate::{
futures_resolver::FuturesResolver, futures_resolver::FuturesResolver,
gh_api_client::GhApiClient, gh_api_client::GhApiClient,
remote::{does_url_exist, Client}, remote::{does_url_exist, Client},
target_triple::TargetTriple,
tasks::AutoAbortJoinHandle, tasks::AutoAbortJoinHandle,
}, },
manifests::cargo_toml_binstall::{PkgFmt, PkgMeta}, manifests::cargo_toml_binstall::{PkgFmt, PkgMeta},
@ -45,6 +46,7 @@ impl GhCrateMeta {
let ctx = Context::from_data_with_repo( let ctx = Context::from_data_with_repo(
&self.data, &self.data,
&self.target_data.target, &self.target_data.target,
&self.target_data.triple,
ext, ext,
repo, repo,
subcrate, subcrate,
@ -275,6 +277,10 @@ impl super::Fetcher for GhCrateMeta {
fn target(&self) -> &str { fn target(&self) -> &str {
&self.target_data.target &self.target_data.target
} }
fn target_data(&self) -> &Arc<TargetData> {
&self.target_data
}
} }
/// Template for constructing download paths /// Template for constructing download paths
@ -295,6 +301,8 @@ struct Context<'c> {
/// Workspace of the crate inside the repository. /// Workspace of the crate inside the repository.
pub subcrate: Option<&'c str>, pub subcrate: Option<&'c str>,
pub triple: &'c TargetTriple,
} }
impl leon::Values for Context<'_> { impl leon::Values for Context<'_> {
@ -316,15 +324,16 @@ impl leon::Values for Context<'_> {
"subcrate" => self.subcrate.map(Cow::Borrowed), "subcrate" => self.subcrate.map(Cow::Borrowed),
_ => None, key => self.triple.get_value(key),
} }
} }
} }
impl<'c> Context<'c> { impl<'c> Context<'c> {
pub(self) fn from_data_with_repo( fn from_data_with_repo(
data: &'c Data, data: &'c Data,
target: &'c str, target: &'c str,
triple: &'c TargetTriple,
archive_suffix: Option<&'c str>, archive_suffix: Option<&'c str>,
repo: Option<&'c str>, repo: Option<&'c str>,
subcrate: Option<&'c str>, subcrate: Option<&'c str>,
@ -344,6 +353,7 @@ impl<'c> Context<'c> {
name: &data.name, name: &data.name,
repo, repo,
target, target,
version: &data.version, version: &data.version,
archive_format, archive_format,
archive_suffix, archive_suffix,
@ -353,18 +363,9 @@ impl<'c> Context<'c> {
"" ""
}, },
subcrate, subcrate,
}
}
#[cfg(test)] triple,
pub(self) fn from_data(data: &'c Data, target: &'c str, archive_format: &'c str) -> Self { }
Self::from_data_with_repo(
data,
target,
Some(archive_format),
data.repo.as_deref(),
None,
)
} }
/// * `tt` - must have added a template named "pkg_url". /// * `tt` - must have added a template named "pkg_url".
@ -388,132 +389,124 @@ impl<'c> Context<'c> {
#[cfg(test)] #[cfg(test)]
mod test { mod test {
use crate::manifests::cargo_toml_binstall::PkgMeta;
use super::{super::Data, Context}; use std::str::FromStr;
use super::{super::Data, Context, TargetTriple};
use compact_str::ToCompactString; use compact_str::ToCompactString;
use url::Url; use url::Url;
const DEFAULT_PKG_URL: &str = "{ repo }/releases/download/v{ version }/{ name }-{ target }-v{ version }.{ archive-format }"; const DEFAULT_PKG_URL: &str = "{ repo }/releases/download/v{ version }/{ name }-{ target }-v{ version }.{ archive-format }";
fn url(s: &str) -> Url { fn assert_context_rendering(
Url::parse(s).unwrap() data: &Data,
target: &str,
archive_format: &str,
template: &str,
expected_url: &str,
) {
let triple = &TargetTriple::from_str(target).unwrap();
let ctx = Context::from_data_with_repo(
data,
target,
triple,
Some(archive_format),
data.repo.as_deref(),
None,
);
let expected_url = Url::parse(expected_url).unwrap();
assert_eq!(ctx.render_url(template).unwrap(), expected_url);
} }
#[test] #[test]
fn defaults() { fn defaults() {
let data = Data::new( assert_context_rendering(
&Data::new(
"cargo-binstall".to_compact_string(), "cargo-binstall".to_compact_string(),
"1.2.3".to_compact_string(), "1.2.3".to_compact_string(),
Some("https://github.com/ryankurte/cargo-binstall".to_string()), Some("https://github.com/ryankurte/cargo-binstall".to_string()),
),
"x86_64-unknown-linux-gnu",
".tgz",
DEFAULT_PKG_URL,
"https://github.com/ryankurte/cargo-binstall/releases/download/v1.2.3/cargo-binstall-x86_64-unknown-linux-gnu-v1.2.3.tgz"
); );
let ctx = Context::from_data(&data, "x86_64-unknown-linux-gnu", ".tgz");
assert_eq!(
ctx.render_url(DEFAULT_PKG_URL).unwrap(),
url("https://github.com/ryankurte/cargo-binstall/releases/download/v1.2.3/cargo-binstall-x86_64-unknown-linux-gnu-v1.2.3.tgz")
);
}
#[test]
#[should_panic]
fn no_repo() {
let meta = PkgMeta::default();
let data = Data::new(
"cargo-binstall".to_compact_string(),
"1.2.3".to_compact_string(),
None,
);
let ctx = Context::from_data(&data, "x86_64-unknown-linux-gnu", ".tgz");
ctx.render_url(meta.pkg_url.as_deref().unwrap()).unwrap();
} }
#[test] #[test]
fn no_repo_but_full_url() { fn no_repo_but_full_url() {
let pkg_url = &format!("https://example.com{}", &DEFAULT_PKG_URL[8..]); assert_context_rendering(
&Data::new(
let data = Data::new(
"cargo-binstall".to_compact_string(), "cargo-binstall".to_compact_string(),
"1.2.3".to_compact_string(), "1.2.3".to_compact_string(),
None, None,
); ),
"x86_64-unknown-linux-gnu",
let ctx = Context::from_data(&data, "x86_64-unknown-linux-gnu", ".tgz"); ".tgz",
assert_eq!( &format!("https://example.com{}", &DEFAULT_PKG_URL[8..]),
ctx.render_url(pkg_url).unwrap(), "https://example.com/releases/download/v1.2.3/cargo-binstall-x86_64-unknown-linux-gnu-v1.2.3.tgz"
url("https://example.com/releases/download/v1.2.3/cargo-binstall-x86_64-unknown-linux-gnu-v1.2.3.tgz")
); );
} }
#[test] #[test]
fn different_url() { fn different_url() {
let pkg_url = assert_context_rendering(
"{ repo }/releases/download/v{ version }/sx128x-util-{ target }-v{ version }.{ archive-format }"; &Data::new(
let data = Data::new(
"radio-sx128x".to_compact_string(), "radio-sx128x".to_compact_string(),
"0.14.1-alpha.5".to_compact_string(), "0.14.1-alpha.5".to_compact_string(),
Some("https://github.com/rust-iot/rust-radio-sx128x".to_string()), Some("https://github.com/rust-iot/rust-radio-sx128x".to_string()),
); ),
"x86_64-unknown-linux-gnu",
let ctx = Context::from_data(&data, "x86_64-unknown-linux-gnu", ".tgz"); ".tgz",
assert_eq!( "{ repo }/releases/download/v{ version }/sx128x-util-{ target }-v{ version }.{ archive-format }",
ctx.render_url(pkg_url).unwrap(), "https://github.com/rust-iot/rust-radio-sx128x/releases/download/v0.14.1-alpha.5/sx128x-util-x86_64-unknown-linux-gnu-v0.14.1-alpha.5.tgz"
url("https://github.com/rust-iot/rust-radio-sx128x/releases/download/v0.14.1-alpha.5/sx128x-util-x86_64-unknown-linux-gnu-v0.14.1-alpha.5.tgz")
); );
} }
#[test] #[test]
fn deprecated_format() { fn deprecated_format() {
let pkg_url = "{ repo }/releases/download/v{ version }/sx128x-util-{ target }-v{ version }.{ format }"; assert_context_rendering(
&Data::new(
let data = Data::new(
"radio-sx128x".to_compact_string(), "radio-sx128x".to_compact_string(),
"0.14.1-alpha.5".to_compact_string(), "0.14.1-alpha.5".to_compact_string(),
Some("https://github.com/rust-iot/rust-radio-sx128x".to_string()), Some("https://github.com/rust-iot/rust-radio-sx128x".to_string()),
); ),
"x86_64-unknown-linux-gnu",
let ctx = Context::from_data(&data, "x86_64-unknown-linux-gnu", ".tgz"); ".tgz",
assert_eq!( "{ repo }/releases/download/v{ version }/sx128x-util-{ target }-v{ version }.{ format }",
ctx.render_url(pkg_url).unwrap(), "https://github.com/rust-iot/rust-radio-sx128x/releases/download/v0.14.1-alpha.5/sx128x-util-x86_64-unknown-linux-gnu-v0.14.1-alpha.5.tgz"
url("https://github.com/rust-iot/rust-radio-sx128x/releases/download/v0.14.1-alpha.5/sx128x-util-x86_64-unknown-linux-gnu-v0.14.1-alpha.5.tgz")
); );
} }
#[test] #[test]
fn different_ext() { fn different_ext() {
let pkg_url = assert_context_rendering(
"{ repo }/releases/download/v{ version }/{ name }-v{ version }-{ target }.tar.xz"; &Data::new(
let data = Data::new(
"cargo-watch".to_compact_string(), "cargo-watch".to_compact_string(),
"9.0.0".to_compact_string(), "9.0.0".to_compact_string(),
Some("https://github.com/watchexec/cargo-watch".to_string()), Some("https://github.com/watchexec/cargo-watch".to_string()),
); ),
"aarch64-apple-darwin",
let ctx = Context::from_data(&data, "aarch64-apple-darwin", ".txz"); ".txz",
assert_eq!( "{ repo }/releases/download/v{ version }/{ name }-v{ version }-{ target }.tar.xz",
ctx.render_url(pkg_url).unwrap(), "https://github.com/watchexec/cargo-watch/releases/download/v9.0.0/cargo-watch-v9.0.0-aarch64-apple-darwin.tar.xz"
url("https://github.com/watchexec/cargo-watch/releases/download/v9.0.0/cargo-watch-v9.0.0-aarch64-apple-darwin.tar.xz")
); );
} }
#[test] #[test]
fn no_archive() { fn no_archive() {
let pkg_url = "{ repo }/releases/download/v{ version }/{ name }-v{ version }-{ target }{ binary-ext }" assert_context_rendering(
; &Data::new(
let data = Data::new(
"cargo-watch".to_compact_string(), "cargo-watch".to_compact_string(),
"9.0.0".to_compact_string(), "9.0.0".to_compact_string(),
Some("https://github.com/watchexec/cargo-watch".to_string()), Some("https://github.com/watchexec/cargo-watch".to_string()),
); ),
"aarch64-pc-windows-msvc",
let ctx = Context::from_data(&data, "aarch64-pc-windows-msvc", ".bin"); ".bin",
assert_eq!( "{ repo }/releases/download/v{ version }/{ name }-v{ version }-{ target }{ binary-ext }",
ctx.render_url(pkg_url).unwrap(), "https://github.com/watchexec/cargo-watch/releases/download/v9.0.0/cargo-watch-v9.0.0-aarch64-pc-windows-msvc.exe"
url("https://github.com/watchexec/cargo-watch/releases/download/v9.0.0/cargo-watch-v9.0.0-aarch64-pc-windows-msvc.exe")
); );
} }
} }

9
crates/binstalk/src/fetchers/quickinstall.rs
View file

@ -9,6 +9,7 @@ use crate::{
helpers::{ helpers::{
download::{Download, ExtractedFiles}, download::{Download, ExtractedFiles},
gh_api_client::GhApiClient, gh_api_client::GhApiClient,
is_universal_macos,
remote::{does_url_exist, Client, Method}, remote::{does_url_exist, Client, Method},
tasks::AutoAbortJoinHandle, tasks::AutoAbortJoinHandle,
}, },
@ -20,10 +21,6 @@ use super::{Data, TargetData};
const BASE_URL: &str = "https://github.com/cargo-bins/cargo-quickinstall/releases/download"; const BASE_URL: &str = "https://github.com/cargo-bins/cargo-quickinstall/releases/download";
const STATS_URL: &str = "https://warehouse-clerk-tmp.vercel.app/api/crate"; const STATS_URL: &str = "https://warehouse-clerk-tmp.vercel.app/api/crate";
fn is_universal_macos(target: &str) -> bool {
["universal-apple-darwin", "universal2-apple-darwin"].contains(&target)
}
pub struct QuickInstall { pub struct QuickInstall {
client: Client, client: Client,
gh_api_client: GhApiClient, gh_api_client: GhApiClient,
@ -136,6 +133,10 @@ by rust officially."#,
fn target(&self) -> &str { fn target(&self) -> &str {
&self.target_data.target &self.target_data.target
} }
fn target_data(&self) -> &Arc<TargetData> {
&self.target_data
}
} }
impl QuickInstall { impl QuickInstall {

5
crates/binstalk/src/helpers.rs
View file

@ -2,6 +2,11 @@ pub mod futures_resolver;
pub mod jobserver_client; pub mod jobserver_client;
pub mod remote; pub mod remote;
pub mod signal; pub mod signal;
pub mod target_triple;
pub mod tasks; pub mod tasks;
pub use binstalk_downloader::{download, gh_api_client}; pub use binstalk_downloader::{download, gh_api_client};
pub fn is_universal_macos(target: &str) -> bool {
["universal-apple-darwin", "universal2-apple-darwin"].contains(&target)
}

54
crates/binstalk/src/helpers/target_triple.rs Normal file
View file

@ -0,0 +1,54 @@
use std::{borrow::Cow, str::FromStr};
use compact_str::{CompactString, ToCompactString};
use target_lexicon::Triple;
use crate::{errors::BinstallError, helpers::is_universal_macos};
#[derive(Clone, Debug)]
pub struct TargetTriple {
// TODO: Once https://github.com/bytecodealliance/target-lexicon/pull/90
// lands, consider replacing use of CompactString with `Cow<'_, str>`.
pub target_family: CompactString,
pub target_arch: CompactString,
pub target_libc: CompactString,
pub target_vendor: CompactString,
}
impl FromStr for TargetTriple {
type Err = BinstallError;
fn from_str(mut s: &str) -> Result<Self, Self::Err> {
let is_universal_macos = is_universal_macos(s);
if is_universal_macos {
s = "x86_64-apple-darwin";
}
let triple = Triple::from_str(s)?;
Ok(Self {
target_family: triple.operating_system.to_compact_string(),
target_arch: if is_universal_macos {
"universal".to_compact_string()
} else {
triple.architecture.to_compact_string()
},
target_libc: triple.environment.to_compact_string(),
target_vendor: triple.vendor.to_compact_string(),
})
}
}
impl leon::Values for TargetTriple {
fn get_value<'s>(&'s self, key: &str) -> Option<Cow<'s, str>> {
match key {
"target-family" => Some(Cow::Borrowed(&self.target_family)),
"target-arch" => Some(Cow::Borrowed(&self.target_arch)),
"target-libc" => Some(Cow::Borrowed(&self.target_libc)),
"target-vendor" => Some(Cow::Borrowed(&self.target_vendor)),
_ => None,
}
}
}

17
crates/binstalk/src/ops/resolve.rs
View file

@ -3,6 +3,7 @@ use std::{
collections::{BTreeMap, BTreeSet}, collections::{BTreeMap, BTreeSet},
iter, mem, iter, mem,
path::Path, path::Path,
str::FromStr,
sync::Arc, sync::Arc,
}; };
@ -21,7 +22,7 @@ use crate::{
drivers::fetch_crate_cratesio, drivers::fetch_crate_cratesio,
errors::{BinstallError, VersionParseError}, errors::{BinstallError, VersionParseError},
fetchers::{Data, Fetcher, TargetData}, fetchers::{Data, Fetcher, TargetData},
helpers::{download::ExtractedFiles, remote::Client}, helpers::{download::ExtractedFiles, remote::Client, target_triple::TargetTriple},
manifests::cargo_toml_binstall::{Meta, PkgMeta, PkgOverride}, manifests::cargo_toml_binstall::{Meta, PkgMeta, PkgOverride},
}; };
@ -76,7 +77,13 @@ async fn resolve_inner(
return Ok(Resolution::AlreadyUpToDate) return Ok(Resolution::AlreadyUpToDate)
}; };
let desired_targets = opts.desired_targets.get().await; let desired_targets = opts
.desired_targets
.get()
.await
.iter()
.map(|target| TargetTriple::from_str(target).map(|triple| (triple, target)))
.collect::<Result<Vec<_>, _>>()?;
let resolvers = &opts.resolvers; let resolvers = &opts.resolvers;
let mut handles: Vec<(Arc<dyn Fetcher>, _)> = let mut handles: Vec<(Arc<dyn Fetcher>, _)> =
@ -90,8 +97,8 @@ async fn resolve_inner(
handles.extend( handles.extend(
desired_targets desired_targets
.iter() .into_iter()
.map(|target| { .map(|(triple, target)| {
debug!("Building metadata for target: {target}"); debug!("Building metadata for target: {target}");
let target_meta = package_info.meta.merge_overrides( let target_meta = package_info.meta.merge_overrides(
@ -102,6 +109,7 @@ async fn resolve_inner(
Arc::new(TargetData { Arc::new(TargetData {
target: target.clone(), target: target.clone(),
triple,
meta: target_meta, meta: target_meta,
}) })
}) })
@ -295,6 +303,7 @@ fn collect_bin_files(
meta, meta,
bin_path, bin_path,
install_path, install_path,
triple: &fetcher.target_data().triple,
}; };
let bin_dir = bin_data let bin_dir = bin_data