Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
@@ -83,8 +83,6 @@ impl DaggerMiddleware for CargoBInstall {
|
||||
pub trait CargoBInstallExt {
|
||||
fn with_cargo_binstall(
|
||||
&mut self,
|
||||
arch: Architecture,
|
||||
os: Os,
|
||||
version: impl Into<String>,
|
||||
crates: impl IntoIterator<Item = impl Into<String>>,
|
||||
) -> &mut Self {
|
||||
@@ -95,15 +93,13 @@ pub trait CargoBInstallExt {
|
||||
impl CargoBInstallExt for RustService {
|
||||
fn with_cargo_binstall(
|
||||
&mut self,
|
||||
arch: Architecture,
|
||||
os: Os,
|
||||
version: impl Into<String>,
|
||||
crates: impl IntoIterator<Item = impl Into<String>>,
|
||||
) -> &mut Self {
|
||||
let crates: Vec<String> = crates.into_iter().map(|s| s.into()).collect();
|
||||
|
||||
self.with_stage(super::RustServiceStage::BeforeDeps(
|
||||
Box::new(CargoBInstall::new(arch, os, version, crates))
|
||||
Box::new(CargoBInstall::new(self.get_arch(), self.get_os(), version, crates))
|
||||
))
|
||||
}
|
||||
}
|
||||
|
@@ -88,25 +88,15 @@ impl DaggerMiddleware for MoldInstall {
|
||||
}
|
||||
|
||||
pub trait MoldActionExt {
|
||||
fn with_mold(
|
||||
&mut self,
|
||||
architecture: Architecture,
|
||||
os: Os,
|
||||
version: impl Into<String>,
|
||||
) -> &mut Self {
|
||||
fn with_mold(&mut self, version: impl Into<String>) -> &mut Self {
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl MoldActionExt for RustService {
|
||||
fn with_mold(
|
||||
&mut self,
|
||||
architecture: Architecture,
|
||||
os: Os,
|
||||
version: impl Into<String>,
|
||||
) -> &mut Self {
|
||||
fn with_mold(&mut self, version: impl Into<String>) -> &mut Self {
|
||||
self.with_stage(super::RustServiceStage::AfterDeps(
|
||||
Box::new(MoldInstall::new(architecture, os, version))
|
||||
Box::new(MoldInstall::new(self.get_arch(), self.get_os(), version))
|
||||
))
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user