From 0ed89b71adf094c0877ccebb9246525a2e1fe969 Mon Sep 17 00:00:00 2001 From: Stefan Kroboth Date: Sun, 27 Oct 2024 07:00:42 +0100 Subject: [PATCH 1/2] CI: switched to stable toolchain for clippy and fmt --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 058d03339..ee6b9f22f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -136,7 +136,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 - - uses: dtolnay/rust-toolchain@beta + - uses: dtolnay/rust-toolchain@stable with: components: clippy - name: Clippy (argmin-math) @@ -161,7 +161,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: Swatinem/rust-cache@v2 - - uses: dtolnay/rust-toolchain@beta + - uses: dtolnay/rust-toolchain@stable with: components: rustfmt - run: cargo fmt --all -- --check From c5a2d63ad854f7bc2896d5b6f3d3c4d3c81238ce Mon Sep 17 00:00:00 2001 From: Stefan Kroboth Date: Sun, 27 Oct 2024 07:01:02 +0100 Subject: [PATCH 2/2] Fixed clippy lints --- crates/argmin-observer-slog/src/lib.rs | 2 +- crates/argmin/src/solver/newton/newton_cg.rs | 2 +- crates/finitediff/src/array/mod.rs | 3 +++ crates/finitediff/src/vec/mod.rs | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/crates/argmin-observer-slog/src/lib.rs b/crates/argmin-observer-slog/src/lib.rs index a05fba08c..0b413b979 100644 --- a/crates/argmin-observer-slog/src/lib.rs +++ b/crates/argmin-observer-slog/src/lib.rs @@ -164,7 +164,7 @@ impl SlogLogger { struct SlogKV<'a>(&'a KV); -impl<'a> slog::KV for SlogKV<'a> { +impl slog::KV for SlogKV<'_> { fn serialize(&self, _record: &Record, serializer: &mut dyn Serializer) -> slog::Result { for idx in self.0.kv.iter() { serializer.emit_str(Key::from(idx.0.to_string()), &idx.1.to_string())?; diff --git a/crates/argmin/src/solver/newton/newton_cg.rs b/crates/argmin/src/solver/newton/newton_cg.rs index 22daf3bb4..5a0dc68b8 100644 --- a/crates/argmin/src/solver/newton/newton_cg.rs +++ b/crates/argmin/src/solver/newton/newton_cg.rs @@ -234,7 +234,7 @@ impl<'a, P, H> CGSubProblem<'a, P, H> { } } -impl<'a, P, H> Operator for CGSubProblem<'a, P, H> +impl Operator for CGSubProblem<'_, P, H> where H: ArgminDot, { diff --git a/crates/finitediff/src/array/mod.rs b/crates/finitediff/src/array/mod.rs index a1bb71048..2ccf1a514 100644 --- a/crates/finitediff/src/array/mod.rs +++ b/crates/finitediff/src/array/mod.rs @@ -5,6 +5,9 @@ // http://opensource.org/licenses/MIT>, at your option. This file may not be // copied, modified, or distributed except according to those terms. +// Some types just are complex +#![allow(clippy::type_complexity)] + pub mod diff; pub mod hessian; pub mod jacobian; diff --git a/crates/finitediff/src/vec/mod.rs b/crates/finitediff/src/vec/mod.rs index 9ec1ab65f..d04ce0637 100644 --- a/crates/finitediff/src/vec/mod.rs +++ b/crates/finitediff/src/vec/mod.rs @@ -5,6 +5,9 @@ // http://opensource.org/licenses/MIT>, at your option. This file may not be // copied, modified, or distributed except according to those terms. +// Some types just are complex +#![allow(clippy::type_complexity)] + pub mod diff; pub mod hessian; pub mod jacobian;