From 76ade28ecf4a9e9827667b29d8b96286c3a47397 Mon Sep 17 00:00:00 2001 From: Kendall Weihe Date: Fri, 27 Sep 2024 07:09:39 -0400 Subject: [PATCH] Fix linting --- Justfile | 3 ++- bindings/web5_c/src/c.rs | 4 ++-- bindings/web5_c/src/crypto/jwk.rs | 6 +++--- bindings/web5_c/src/crypto/mod.rs | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Justfile b/Justfile index ccb449df..c46fab0a 100644 --- a/Justfile +++ b/Justfile @@ -25,7 +25,8 @@ test: setup cargo test --workspace lint: setup - cargo clippy --workspace + cargo clippy --workspace --exclude web5_c + cargo clippy --package web5_c -- -A clippy::not_unsafe_ptr_arg_deref cargo fmt bind: setup diff --git a/bindings/web5_c/src/c.rs b/bindings/web5_c/src/c.rs index 29981a93..24194377 100644 --- a/bindings/web5_c/src/c.rs +++ b/bindings/web5_c/src/c.rs @@ -18,11 +18,11 @@ pub fn free_bytes(ptr: *mut u8) { } } -pub unsafe fn opt_cstr_to_string(c_str: *const c_char) -> Option { +pub fn opt_cstr_to_string(c_str: *const c_char) -> Option { if c_str.is_null() { None } else { - Some(CStr::from_ptr(c_str).to_string_lossy().into_owned()) + Some(unsafe { CStr::from_ptr(c_str).to_string_lossy().into_owned() }) } } diff --git a/bindings/web5_c/src/crypto/jwk.rs b/bindings/web5_c/src/crypto/jwk.rs index c5667f82..41c339df 100644 --- a/bindings/web5_c/src/crypto/jwk.rs +++ b/bindings/web5_c/src/crypto/jwk.rs @@ -57,12 +57,12 @@ pub extern "C" fn free_cjwk(jwk: *mut CJwk) { impl From<&CJwk> for Jwk { fn from(jwk_c: &CJwk) -> Self { Jwk { - alg: unsafe { opt_cstr_to_string(jwk_c.alg) }, + alg: opt_cstr_to_string(jwk_c.alg), kty: unsafe { CStr::from_ptr(jwk_c.kty).to_string_lossy().into_owned() }, crv: unsafe { CStr::from_ptr(jwk_c.crv).to_string_lossy().into_owned() }, - d: unsafe { opt_cstr_to_string(jwk_c.d) }, + d: opt_cstr_to_string(jwk_c.d), x: unsafe { CStr::from_ptr(jwk_c.x).to_string_lossy().into_owned() }, - y: unsafe { opt_cstr_to_string(jwk_c.y) }, + y: opt_cstr_to_string(jwk_c.y), } } } diff --git a/bindings/web5_c/src/crypto/mod.rs b/bindings/web5_c/src/crypto/mod.rs index 69f2df45..e3d1e24a 100644 --- a/bindings/web5_c/src/crypto/mod.rs +++ b/bindings/web5_c/src/crypto/mod.rs @@ -1,4 +1,4 @@ pub mod dsa; pub mod key_managers; -pub mod jwk; \ No newline at end of file +pub mod jwk;