Skip to content

Commit c8db77b

Browse files
authored
Merge pull request #1013 from muzarski/clippy_fix_06_18
CI: fix clippy issues
2 parents 0f73b6a + c531974 commit c8db77b

File tree

10 files changed

+25
-2
lines changed

10 files changed

+25
-2
lines changed

.github/workflows/authenticate_test.yml

+2
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,7 @@ jobs:
2727
options: --health-cmd "cqlsh --username cassandra --password cassandra --debug" --health-interval 5s --health-retries 30
2828
steps:
2929
- uses: actions/checkout@v3
30+
- name: Update rust toolchain
31+
run: rustup update
3032
- name: Run tests
3133
run: RUST_LOG=trace cargo test --verbose authenticate_superuser -- custom_authentication --ignored

.github/workflows/book.yml

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
options: --health-cmd "cqlsh --debug scylladb" --health-interval 5s --health-retries 10
2828
steps:
2929
- uses: actions/checkout@v3
30+
- name: Update rust toolchain
31+
run: rustup update
3032
- name: Install mdbook
3133
run: cargo install mdbook --no-default-features
3234
- name: Build the project

.github/workflows/cassandra.yml

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
run: |
2626
docker compose -f test/cluster/cassandra/docker-compose.yml up -d --wait
2727
# A separate step for building to separate measuring time of compilation and testing
28+
- name: Update rust toolchain
29+
run: rustup update
2830
- name: Build the project
2931
run: cargo build --verbose --tests --features "full-serialization"
3032
- name: Run tests on cassandra

.github/workflows/rust.yml

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
run: |
2727
sudo sh -c "echo 2097152 >> /proc/sys/fs/aio-max-nr"
2828
docker compose -f test/cluster/docker-compose.yml up -d --wait
29+
- name: Update rust toolchain
30+
run: rustup update
2931
- name: Print rustc version
3032
run: rustc --version
3133
- name: Print rustfmt version
@@ -98,5 +100,7 @@ jobs:
98100
runs-on: ubuntu-latest
99101
steps:
100102
- uses: actions/checkout@v3
103+
- name: Update rust toolchain
104+
run: rustup update
101105
- name: Compile docs
102106
run: RUSTDOCFLAGS=-Dwarnings cargo doc

.github/workflows/semver_checks.yml

+4
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ jobs:
5656
# I don't know any way to do this using checkout action
5757
- name: Fetch PR base
5858
run: git fetch origin "$PR_BASE"
59+
- name: Update rust toolchain
60+
run: rustup update
5961
- name: Install semver-checks
6062
# Official action uses binary releases fetched from GitHub
6163
# If this pipeline becomes too slow, we should do this too
@@ -142,6 +144,8 @@ jobs:
142144
timeout-minutes: 30
143145
steps:
144146
- uses: actions/checkout@v3
147+
- name: Update rust toolchain
148+
run: rustup update
145149
- name: Install semver-checks
146150
run: cargo install cargo-semver-checks --no-default-features
147151
- name: Run semver-checks to see if it agrees with version updates

.github/workflows/serverless.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ jobs:
2929
run: |
3030
ccm create serverless -i 127.0.1. -n 1 --scylla -v release:5.1.6
3131
ccm start --sni-proxy --sni-port 7777
32-
32+
- name: Update rust toolchain
33+
run: rustup update
3334
- name: Check
3435
run: cargo check --verbose
3536
- name: Run cloud example

.github/workflows/tls.yml

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
working-directory: ./scylla
3333
steps:
3434
- uses: actions/checkout@v3
35+
- name: Update rust toolchain
36+
run: rustup update
3537
- name: Check
3638
run: cargo check --verbose --features "ssl"
3739
working-directory: ${{env.working-directory}}

scylla-macros/src/serialize/row.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// See: https://github.com/TedDriggs/darling/issues/293
2+
#![allow(clippy::manual_unwrap_or_default)]
3+
14
use std::collections::HashMap;
25

36
use darling::FromAttributes;

scylla-macros/src/serialize/value.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// See: https://github.com/TedDriggs/darling/issues/293
2+
#![allow(clippy::manual_unwrap_or_default)]
3+
14
use std::collections::HashMap;
25

36
use darling::FromAttributes;

scylla/src/transport/connection.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1826,7 +1826,7 @@ struct StreamIdSet {
18261826

18271827
impl StreamIdSet {
18281828
fn new() -> Self {
1829-
const BITMAP_SIZE: usize = (std::i16::MAX as usize + 1) / 64;
1829+
const BITMAP_SIZE: usize = (i16::MAX as usize + 1) / 64;
18301830
Self {
18311831
used_bitmap: vec![0; BITMAP_SIZE].into_boxed_slice(),
18321832
}

0 commit comments

Comments
 (0)