Skip to content

Commit 1e97cd9

Browse files
chore: fix clippy
1 parent 1d2f814 commit 1e97cd9

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.github/workflows/rs_ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,11 @@ jobs:
7676
components: clippy
7777
cache: false
7878
- uses: mozilla-actions/[email protected]
79+
# We need to do these separately because the fips feature is incompatible with the default feature.
7980
- working-directory: bottlecap
80-
run: cargo clippy --workspace --all-features
81+
run: cargo clippy --workspace --features default
82+
- working-directory: bottlecap
83+
run: cargo clippy --workspace --no-default-features --features fips
8184

8285
build-all:
8386
name: Build All

.gitlab/templates/pipeline.yaml.tpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ cargo clippy:
3939
needs: []
4040
script:
4141
- apt-get update && apt-get install -y --fix-missing --no-install-recommends golang-go
42-
- cd bottlecap && cargo clippy --workspace --all-features
42+
- cd bottlecap
43+
# We need to do these separately because the fips feature is incompatible with the default feature.
44+
- cargo clippy --workspace --features default
45+
- cargo clippy --workspace --no-default-features --features fips
4346

4447
{{ range $flavor := (ds "flavors").flavors }}
4548

bottlecap/src/bin/bottlecap/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ fn prepare_client_provider() -> Result<()> {
102102
}
103103

104104
#[cfg(not(feature = "fips"))]
105+
// this is not unnecessary since the fips version can return an error
106+
#[allow(clippy::unnecessary_wraps)]
105107
fn prepare_client_provider() -> Result<()> {
106108
// No-op in non-FIPS mode
107109
Ok(())

0 commit comments

Comments
 (0)