diff --git a/src/setup/runnable.rs b/src/setup/runnable.rs index add3f49..5c3a1c3 100644 --- a/src/setup/runnable.rs +++ b/src/setup/runnable.rs @@ -32,7 +32,6 @@ where macro_rules! runnable_for_tuple { ( $($name:ident)* ) => ( - #[allow(clippy::let_unit_value)] #[async_trait(?Send)] #[allow(non_snake_case)] impl<$($name: Symbol + Debug,)*> Runnable for ($($name,)*) { @@ -118,7 +117,7 @@ mod test { async fn run_symbol( &self, symbol: &S, - _logger: &L, + logger: &L, force: bool, ) -> Result> { let run = force || !symbol.target_reached().await?; diff --git a/src/setup/setup.rs b/src/setup/setup.rs index 842152b..4efd0ab 100644 --- a/src/setup/setup.rs +++ b/src/setup/setup.rs @@ -201,7 +201,7 @@ mod test { async fn run_symbol( &self, symbol: &S, - _logger: &L, + logger: &L, force: bool, ) -> Result> { let run = force || !symbol.target_reached().await?; @@ -239,7 +239,7 @@ mod test { #[derive(Clone)] struct Artifacts; impl FromArtifact> for Artifacts { - fn from_artifact(_from: ()) -> Self { + fn from_artifact(from: ()) -> Self { Self } fn into_artifact(self) -> () { diff --git a/src/symbols/git/checkout.rs b/src/symbols/git/checkout.rs index 14593ba..e2ad4a5 100644 --- a/src/symbols/git/checkout.rs +++ b/src/symbols/git/checkout.rs @@ -63,12 +63,7 @@ impl, P: AsRef, S: AsRef, B: AsRef Result<(), Box> { - if self.target.as_ref().exists() { - self - .run_git(&["fetch", self.source.as_ref(), self.branch.as_ref()]) - .await?; - self.run_git(&["merge", "FETCH_HEAD"]).await?; - } else { + if !self.target.as_ref().exists() { self .command_runner .borrow() @@ -85,6 +80,11 @@ impl, P: AsRef, S: AsRef, B: AsRef ToArtifact for Option { - // FIXME: https://github.com/rust-lang/rust-clippy/issues/2843 - #![allow(clippy::use_self)] type Artifact = Option; }