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

Replace Box<str> with String

Browse source
This commit is contained in:
Félix Saparelli 2022-06-08 00:54:49 +12:00
parent 15d828b55b
commit fcf5728dde
No known key found for this signature in database
GPG key ID: B948C4BAE44FC474
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/target.rs
View file

@ -18,13 +18,13 @@ pub const TARGET: &str = env!("TARGET");
/// ///
/// Check [this issue](https://github.com/ryankurte/cargo-binstall/issues/155) /// Check [this issue](https://github.com/ryankurte/cargo-binstall/issues/155)
/// for more information. /// for more information.
pub async fn detect_targets() -> Vec<Box<str>> { pub async fn detect_targets() -> Vec<String> {
if let Some(target) = get_target_from_rustc().await { if let Some(target) = get_target_from_rustc().await {
let mut v = vec![target]; let mut v = vec![target];
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
if v[0].contains("gnu") { if v[0].contains("gnu") {
v.push(v[0].replace("gnu", "musl").into_boxed_str()); v.push(v[0].replace("gnu", "musl"));
} }
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
@ -51,7 +51,7 @@ pub async fn detect_targets() -> Vec<Box<str>> {
/// Figure out what the host target is using `rustc`. /// Figure out what the host target is using `rustc`.
/// If `rustc` is absent, then it would return `None`. /// If `rustc` is absent, then it would return `None`.
async fn get_target_from_rustc() -> Option<Box<str>> { async fn get_target_from_rustc() -> Option<String> {
let Output { status, stdout, .. } = Command::new("rustc").arg("-vV").output().await.ok()?; let Output { status, stdout, .. } = Command::new("rustc").arg("-vV").output().await.ok()?;
if !status.success() { if !status.success() {
return None; return None;
@ -60,17 +60,14 @@ async fn get_target_from_rustc() -> Option<Box<str>> {
Cursor::new(stdout) Cursor::new(stdout)
.lines() .lines()
.filter_map(|line| line.ok()) .filter_map(|line| line.ok())
.find_map(|line| { .find_map(|line| line.strip_prefix("host: ").map(|host| host.to_owned()))
line.strip_prefix("host: ")
.map(|host| host.to_owned().into_boxed_str())
})
} }
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
mod linux { mod linux {
use super::{Command, Output, TARGET}; use super::{Command, Output, TARGET};
pub(super) async fn detect_targets_linux() -> Vec<Box<str>> { pub(super) async fn detect_targets_linux() -> Vec<String> {
let abi = parse_abi(); let abi = parse_abi();
if let Ok(Output { if let Ok(Output {
@ -123,16 +120,13 @@ mod linux {
} }
} }
fn create_target_str(libc_version: &str, abi: &str) -> Box<str> { fn create_target_str(libc_version: &str, abi: &str) -> String {
let prefix = TARGET.rsplit_once('-').unwrap().0; let prefix = TARGET
.rsplit_once('-')
.map(|s| format!("{}-", s.0))
.unwrap_or_default();
let mut target = String::with_capacity(prefix.len() + 1 + libc_version.len() + abi.len()); format!("{prefix}{libc_version}{abi}")
target.push_str(prefix);
target.push('-');
target.push_str(libc_version);
target.push_str(abi);
target.into_boxed_str()
} }
} }
@ -143,7 +137,7 @@ mod macos {
pub(super) const AARCH64: &str = "aarch64-apple-darwin"; pub(super) const AARCH64: &str = "aarch64-apple-darwin";
pub(super) const X86: &str = "x86_64-apple-darwin"; pub(super) const X86: &str = "x86_64-apple-darwin";
pub(super) fn detect_targets_macos() -> Vec<Box<str>> { pub(super) fn detect_targets_macos() -> Vec<String> {
if guess_host_triple() == Some(AARCH64) { if guess_host_triple() == Some(AARCH64) {
vec![AARCH64.into(), X86.into()] vec![AARCH64.into(), X86.into()]
} else { } else {