diff --git a/src/async_utils.rs b/src/async_utils.rs index aaae4db..84613b0 100644 --- a/src/async_utils.rs +++ b/src/async_utils.rs @@ -14,7 +14,7 @@ pub fn run(future: F) -> F::Output { Builder::new_current_thread() .enable_io() .build() - .expect("Error setting up async runtime") + .unwrap() .block_on(future) } pub use tokio::join; @@ -52,7 +52,7 @@ impl Future for TimerFuture { }; *state = State::Completed; if let Some(w) = waker { - w.wake(); + w.wake() } }); } diff --git a/src/loggers.rs b/src/loggers.rs index 1357173..dcbd0e1 100644 --- a/src/loggers.rs +++ b/src/loggers.rs @@ -21,19 +21,19 @@ pub trait Logger { where Self: Sized, { - self.writeln(3, msg); + self.writeln(3, msg) } fn debug + Into>(&self, msg: S) where Self: Sized, { - self.writeln(4, msg); + self.writeln(4, msg) } fn trace + Into>(&self, msg: S) where Self: Sized, { - self.writeln(5, msg); + self.writeln(5, msg) } fn put + Into>(&self, entries: impl IntoIterator>) -> usize where @@ -88,12 +88,12 @@ impl<'a, L> FilteringLogger<'a, L> { impl<'a, L: Logger> Logger for FilteringLogger<'a, L> { fn write + Into>(&self, level: Level, str: S) { if level <= self.max_level { - self.logger.write(level, str); + self.logger.write(level, str) } } fn writeln + Into>(&self, level: Level, str: S) { if level <= self.max_level { - self.logger.writeln(level, str); + self.logger.writeln(level, str) } } } diff --git a/src/setup/core.rs b/src/setup/core.rs index 4a640ea..3140e4c 100644 --- a/src/setup/core.rs +++ b/src/setup/core.rs @@ -33,7 +33,7 @@ macro_rules! add_generic { $name::Artifact: Clone ),* { - #[allow(unused, clippy::shadow_unrelated)] + #[allow(unused)] async fn add_generic(&self, ($($name,)*): ($($name,)*)) -> Result<(StoringLogger, ($($name::Artifact,)*), bool), (StoringLogger, Box)> { let ($($name,)*) = join!($(self.add($name, false),)*); diff --git a/src/setup/setup.rs b/src/setup/setup.rs index 6d06eef..cad65cd 100644 --- a/src/setup/setup.rs +++ b/src/setup/setup.rs @@ -34,8 +34,6 @@ impl self.0.resources.borrow_mut() } - // FIXME: https://github.com/rust-lang/rust-clippy/issues/6353 - #[allow(clippy::await_holding_refcell_ref)] pub async fn add(&self, resource: R, force_run: bool) -> InternalAddResult where Rs: FromResource, diff --git a/src/setup/symbol_runner.rs b/src/setup/symbol_runner.rs index e9b3b10..378cd90 100644 --- a/src/setup/symbol_runner.rs +++ b/src/setup/symbol_runner.rs @@ -101,11 +101,6 @@ impl SymbolRunner for DelayingSymbolRunner where R: SymbolRunner, { - #[allow( - clippy::cast_sign_loss, - clippy::cast_possible_truncation, - clippy::cast_precision_loss - )] async fn run_symbol( &self, symbol: &S, @@ -187,9 +182,9 @@ where logger.debug(format!("Running symbol {:?}", symbol)); let res = self.0.run_symbol(symbol, logger, force).await; if let Err(ref e) = res { - logger.info(format!("Failed on {:?} with {}, aborting.", symbol, e)); + logger.info(format!("Failed on {:?} with {}, aborting.", symbol, e)) } else { - logger.debug(format!("Successfully finished {:?}", symbol)); + logger.debug(format!("Successfully finished {:?}", symbol)) } res } diff --git a/src/symbols/npm.rs b/src/symbols/npm.rs index b2a95bc..f6596b9 100644 --- a/src/symbols/npm.rs +++ b/src/symbols/npm.rs @@ -42,10 +42,7 @@ impl, C: CommandRunner> Symbol for Install<'_, T, C> { "sh", args![ "-c", - format!( - "cd '{}' && npm ls --prod", - self.target.as_ref().to_str().unwrap() - ), + format!("cd '{}' && npm ls", self.target.as_ref().to_str().unwrap()), ], ) .await?; diff --git a/src/symbols/systemd/user_service.rs b/src/symbols/systemd/user_service.rs index f795786..9947f98 100644 --- a/src/symbols/systemd/user_service.rs +++ b/src/symbols/systemd/user_service.rs @@ -36,11 +36,12 @@ impl, U: AsRef, R: CommandRunner> UserService<'_, S, U, R> { let result = self.command_runner.run_with_args("systemctl", args).await?; if result.status.success() { return Ok(String::from_utf8(result.stdout)?.trim_end().to_string()); - } - let raw_stderr = String::from_utf8(result.stderr)?; - let stderr = raw_stderr.trim_end(); - if stderr != "Failed to connect to bus: No such file or directory" { - return Err(stderr.into()); + } else { + let raw_stderr = String::from_utf8(result.stderr)?; + let stderr = raw_stderr.trim_end(); + if stderr != "Failed to connect to bus: No such file or directory" { + return Err(stderr.into()); + } } tries -= 1; if tries == 0 { diff --git a/src/symbols/wordpress/translation.rs b/src/symbols/wordpress/translation.rs index 6643c9e..93b7344 100644 --- a/src/symbols/wordpress/translation.rs +++ b/src/symbols/wordpress/translation.rs @@ -53,7 +53,7 @@ impl, D: AsRef, R: CommandRunner> Translation<'_, C, D, R> { res.push(( format!("https://translate.wordpress.org/projects/wp/{}/{}{}/default/export-translations?format={}", version_x, in_slug, path_locale, format), [self.path.as_ref(), format!("{}{}.{}", out_slug, self.locale.as_ref(), format).as_ref()].iter().collect() - )); + )) } } res