From a1d7ed1258f052c3a15610aa5fec885c263d1516 Mon Sep 17 00:00:00 2001 From: unvalley Date: Fri, 28 Oct 2022 22:07:18 +0900 Subject: [PATCH] fix clippy error and remove clippy job from ci Remove clippy job Fix clippy error type_complexity Restore ambiguous change --- .github/workflows/rust.yml | 18 ------------------ bors.toml | 1 - milli/src/update/facet/bulk.rs | 10 ++++++++-- 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e640ee1ef..9939d3f24 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -48,24 +48,6 @@ jobs: command: test args: --release - clippy: - name: Run Clippy - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v3 - - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true - components: clippy - - name: Cache dependencies - uses: Swatinem/rust-cache@v2.0.0 - - name: Run cargo clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - fmt: name: Run Rustfmt runs-on: ubuntu-20.04 diff --git a/bors.toml b/bors.toml index 8ba0eed94..73324892f 100644 --- a/bors.toml +++ b/bors.toml @@ -2,7 +2,6 @@ status = [ 'Tests on ubuntu-20.04', 'Tests on macos-latest', 'Tests on windows-latest', - 'Run Clippy', 'Run Rustfmt', ] # 3 hours timeout diff --git a/milli/src/update/facet/bulk.rs b/milli/src/update/facet/bulk.rs index 2a4c7f49a..9dd62f49f 100644 --- a/milli/src/update/facet/bulk.rs +++ b/milli/src/update/facet/bulk.rs @@ -196,7 +196,10 @@ impl FacetsUpdateBulkInner { &self, rtxn: &'t RoTxn, field_id: u16, - handle_group: &mut dyn FnMut(&[RoaringBitmap], &'t [u8]) -> Result<()>, + #[allow(clippy::type_complexity)] handle_group: &mut dyn FnMut( + &[RoaringBitmap], + &'t [u8], + ) -> Result<()>, ) -> Result<()> { // we read the elements one by one and // 1. keep track of the left bound @@ -250,7 +253,10 @@ impl FacetsUpdateBulkInner { rtxn: &'t RoTxn, field_id: u16, level: u8, - handle_group: &mut dyn FnMut(&[RoaringBitmap], &'t [u8]) -> Result<()>, + #[allow(clippy::type_complexity)] handle_group: &mut dyn FnMut( + &[RoaringBitmap], + &'t [u8], + ) -> Result<()>, ) -> Result>> { if level == 0 { self.read_level_0(rtxn, field_id, handle_group)?;