From 0c42cb35ebd05c929a643ca240cf3aa35c04f9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Mon, 20 Nov 2023 14:40:22 +0100 Subject: [PATCH] Make clippy happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga --- .github/workflows/ci.yml | 2 +- clotributor-registrar/src/registrar.rs | 2 +- clotributor-tracker/src/tracker.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a29434b..e62b626 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Rust uses: actions-rs/toolchain@v1 with: - toolchain: 1.73.0 + toolchain: 1.74.0 profile: minimal components: clippy, rustfmt override: true diff --git a/clotributor-registrar/src/registrar.rs b/clotributor-registrar/src/registrar.rs index 5c15de4..8b1be66 100644 --- a/clotributor-registrar/src/registrar.rs +++ b/clotributor-registrar/src/registrar.rs @@ -132,7 +132,7 @@ pub(crate) async fn run(cfg: &Config, db: DynDB) -> Result<()> { |final_result, task_result| match task_result { Ok(()) => final_result, Err(task_err) => match final_result { - Ok(()) => Err(task_err).map_err(Into::into), + Ok(()) => Err(Into::into(task_err)), Err(final_err) => Err(format_err!("{:#}\n{:#}", final_err, task_err)), }, }, diff --git a/clotributor-tracker/src/tracker.rs b/clotributor-tracker/src/tracker.rs index 2f38415..329cda3 100644 --- a/clotributor-tracker/src/tracker.rs +++ b/clotributor-tracker/src/tracker.rs @@ -306,7 +306,7 @@ pub(crate) async fn run(cfg: &Config, db: DynDB, gh: DynGH) -> Result<()> { |final_result, task_result| match task_result { Ok(()) => final_result, Err(task_err) => match final_result { - Ok(()) => Err(task_err).map_err(Into::into), + Ok(()) => Err(Into::into(task_err)), Err(final_err) => Err(format_err!("{:#}\n{:#}", final_err, task_err)), }, },