Skip to content

Commit 0e589dc

Browse files
committed
Fix CI clippy failures and CI script
Adding a Rustup update at the beginning of the CI script to ensure that all of the checks, particularly with clippy, are done using the latest version of the compiler toolchain. Two issues flagged by clippy are also fixed. Signed-off-by: Ionut Mihalcea <[email protected]>
1 parent 26f481f commit 0e589dc

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ci.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ setup_mappings() {
126126
reload_service
127127
}
128128

129+
# Use the newest version of the Rust toolchain
130+
rustup update
131+
129132
# Parse arguments
130133
NO_CARGO_CLEAN=
131134
NO_STRESS_TEST=
@@ -288,7 +291,6 @@ if [ "$PROVIDER_NAME" = "cargo-check" ]; then
288291
# - openSUSE Tumbleweed
289292
# - openSUSE Leap 15.3
290293
# The oldest is currently in openSUSE Leap 15.3 and is 1.53.0.
291-
rustup update
292294

293295
rustup toolchain install 1.53.0
294296
# The "jwt-svid-authenticator" can not be compiled on 1.53.0

src/providers/mbed_crypto/mod.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,10 @@ impl Provider {
149149
}
150150
};
151151
for key_identity in to_remove.iter() {
152-
if mbed_crypto_provider
152+
mbed_crypto_provider
153153
.key_info_store
154154
.remove_key_info(key_identity)
155-
.is_err()
156-
{
157-
return None;
158-
}
155+
.ok()?;
159156
}
160157
}
161158
mbed_crypto_provider.id_counter.store(max_key_id, Relaxed);

src/providers/trusted_service/context/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use ts_protobuf::GetOpcode;
2727
unused_qualifications
2828
)]
2929
pub mod ts_binding {
30+
#![allow(deref_nullptr)]
3031
include!(concat!(env!("OUT_DIR"), "/ts_bindings.rs"));
3132
}
3233

0 commit comments

Comments
 (0)