Style

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<S: Symbol + Debug, L: Logger>(
       &self,
       symbol: &S,
-      _logger: &L,
+      logger: &L,
       force: bool,
     ) -> Result<bool, Box<dyn Error>> {
       let run = force || !symbol.target_reached().await?;

src/setup/setup.rs

@@ -201,7 +201,7 @@ mod test {
     async fn run_symbol<S: Symbol + Debug, L: Logger>(
       &self,
       symbol: &S,
-      _logger: &L,
+      logger: &L,
       force: bool,
     ) -> Result<bool, Box<dyn Error>> {
       let run = force || !symbol.target_reached().await?;
@@ -239,7 +239,7 @@ mod test {
   #[derive(Clone)]
   struct Artifacts;
   impl<V> FromArtifact<TestResource<V>> for Artifacts {
-    fn from_artifact(_from: ()) -> Self {
+    fn from_artifact(from: ()) -> Self {
       Self
     }
     fn into_artifact(self) -> () {

src/symbols/git/checkout.rs

@@ -63,12 +63,7 @@ impl<C: CommandRunner, _C: Borrow<C>, P: AsRef<Path>, S: AsRef<str>, B: AsRef<st
   }
 
   async fn execute(&self) -> Result<(), Box<dyn Error>> {
-    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<C: CommandRunner, _C: Borrow<C>, P: AsRef<Path>, S: AsRef<str>, B: AsRef<st
           ],
         )
         .await?;
+    } else {
+      self
+        .run_git(&["fetch", self.source.as_ref(), self.branch.as_ref()])
+        .await?;
+      self.run_git(&["merge", "FETCH_HEAD"]).await?;
     }
     Ok(())
   }

src/to_artifact.rs

@@ -17,8 +17,6 @@ macro_rules! to_artifact {
 for_each_tuple!(to_artifact);
 
 impl<T: Resource> ToArtifact for Option<T> {
-  // FIXME: https://github.com/rust-lang/rust-clippy/issues/2843
-  #![allow(clippy::use_self)]
   type Artifact = Option<T::Artifact>;
 }