mirror of
https://github.com/cargo-bins/cargo-binstall.git
synced 2025-04-20 20:48:43 +00:00
Add new fn get_desired_targets
& newtype DesiredTargets
so that if `opts.targets` is `None`, the future returned by `detect_targets` can be run in parallel by using `tokio::spawn` with other async code in `entry`, such as `fetch_crate_cratesio`. Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
parent
a747edffd5
commit
be4b3ead97
1 changed files with 58 additions and 0 deletions
|
@ -1,10 +1,68 @@
|
||||||
use std::io::{BufRead, Cursor};
|
use std::io::{BufRead, Cursor};
|
||||||
use std::process::Output;
|
use std::process::Output;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
use tokio::process::Command;
|
use tokio::process::Command;
|
||||||
|
use tokio::sync::OnceCell;
|
||||||
|
|
||||||
/// Compiled target triple, used as default for binary fetching
|
/// Compiled target triple, used as default for binary fetching
|
||||||
pub const TARGET: &str = env!("TARGET");
|
pub const TARGET: &str = env!("TARGET");
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
enum DesiredTargetsInner {
|
||||||
|
AutoDetect(Arc<OnceCell<Vec<String>>>),
|
||||||
|
Initialized(Vec<String>),
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct DesiredTargets(DesiredTargetsInner);
|
||||||
|
|
||||||
|
impl DesiredTargets {
|
||||||
|
fn initialized(targets: Vec<String>) -> Self {
|
||||||
|
Self(DesiredTargetsInner::Initialized(targets))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn auto_detect() -> Self {
|
||||||
|
let arc = Arc::new(OnceCell::new());
|
||||||
|
|
||||||
|
let once_cell = arc.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
once_cell.get_or_init(detect_targets).await;
|
||||||
|
});
|
||||||
|
|
||||||
|
Self(DesiredTargetsInner::AutoDetect(arc))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get(&self) -> &[String] {
|
||||||
|
use DesiredTargetsInner::*;
|
||||||
|
|
||||||
|
match &self.0 {
|
||||||
|
Initialized(targets) => targets,
|
||||||
|
|
||||||
|
// This will mostly just wait for the spawned task,
|
||||||
|
// on rare occausion though, it will poll the future
|
||||||
|
// returned by `detect_targets`.
|
||||||
|
AutoDetect(once_cell) => once_cell.get_or_init(detect_targets).await,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// If opts_targets is `Some`, then it will be used.
|
||||||
|
/// Otherwise, call `detect_targets` using `tokio::spawn` to detect targets.
|
||||||
|
///
|
||||||
|
/// Since `detect_targets` internally spawns a process and wait for it,
|
||||||
|
/// it's pretty costy.
|
||||||
|
///
|
||||||
|
/// Calling it through `tokio::spawn` would enable other tasks, such as
|
||||||
|
/// fetching the crate tarballs, to be executed concurrently.
|
||||||
|
pub fn get_desired_targets(opts_targets: &Option<String>) -> DesiredTargets {
|
||||||
|
if let Some(targets) = opts_targets.as_ref() {
|
||||||
|
DesiredTargets::initialized(targets.split(',').map(|t| t.to_string()).collect())
|
||||||
|
} else {
|
||||||
|
DesiredTargets::auto_detect()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Detect the targets supported at runtime,
|
/// Detect the targets supported at runtime,
|
||||||
/// which might be different from `TARGET` which is detected
|
/// which might be different from `TARGET` which is detected
|
||||||
/// at compile-time.
|
/// at compile-time.
|
||||||
|
|
Loading…
Add table
Reference in a new issue