Skip to content

cargo: enable unsafe-op-in-unsafe-fn compiler lint #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2025
Merged

cargo: enable unsafe-op-in-unsafe-fn compiler lint #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions scylla-rust-wrapper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,6 @@ opt-level = 3
codegen-units = 1
debug = 2
strip = "none"

[lints.rust]
unsafe-op-in-unsafe-fn = "warn"
14 changes: 8 additions & 6 deletions scylla-rust-wrapper/src/argconv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ use std::ptr::NonNull;
use std::sync::{Arc, Weak};

pub unsafe fn ptr_to_cstr(ptr: *const c_char) -> Option<&'static str> {
CStr::from_ptr(ptr).to_str().ok()
unsafe { CStr::from_ptr(ptr) }.to_str().ok()
}

pub unsafe fn ptr_to_cstr_n(ptr: *const c_char, size: size_t) -> Option<&'static str> {
if ptr.is_null() {
return None;
}
std::str::from_utf8(std::slice::from_raw_parts(ptr as *const u8, size as usize)).ok()
std::str::from_utf8(unsafe { std::slice::from_raw_parts(ptr as *const u8, size as usize) }).ok()
}

pub unsafe fn arr_to_cstr<const N: usize>(arr: &[c_char]) -> Option<&'static str> {
let null_char = '\0' as c_char;
let end_index = arr[..N].iter().position(|c| c == &null_char).unwrap_or(N);
ptr_to_cstr_n(arr.as_ptr(), end_index as size_t)
unsafe { ptr_to_cstr_n(arr.as_ptr(), end_index as size_t) }
}

pub fn str_to_arr<const N: usize>(s: &str) -> [c_char; N] {
Expand All @@ -41,15 +41,17 @@ pub fn str_to_arr<const N: usize>(s: &str) -> [c_char; N] {
}

pub unsafe fn write_str_to_c(s: &str, c_str: *mut *const c_char, c_strlen: *mut size_t) {
*c_str = s.as_ptr() as *const c_char;
*c_strlen = s.len() as u64;
unsafe {
*c_str = s.as_ptr() as *const c_char;
*c_strlen = s.len() as u64;
}
}

pub unsafe fn strlen(ptr: *const c_char) -> size_t {
if ptr.is_null() {
return 0;
}
libc::strlen(ptr) as size_t
unsafe { libc::strlen(ptr) as size_t }
}

#[cfg(test)]
Expand Down
12 changes: 6 additions & 6 deletions scylla-rust-wrapper/src/binding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ macro_rules! make_name_binder {
// For some reason detected as unused, which is not true
#[allow(unused_imports)]
use crate::value::CassCqlValue::*;
let name = ptr_to_cstr(name).unwrap();
let name = unsafe { ptr_to_cstr(name) }.unwrap();
match ($e)($($arg), *) {
Ok(v) => $consume_v(BoxFFI::as_mut_ref(this).unwrap(), name, v),
Err(e) => e,
Expand All @@ -102,7 +102,7 @@ macro_rules! make_name_n_binder {
// For some reason detected as unused, which is not true
#[allow(unused_imports)]
use crate::value::CassCqlValue::*;
let name = ptr_to_cstr_n(name, name_length).unwrap();
let name = unsafe { ptr_to_cstr_n(name, name_length) }.unwrap();
match ($e)($($arg), *) {
Ok(v) => $consume_v(BoxFFI::as_mut_ref(this).unwrap(), name, v),
Err(e) => e,
Expand Down Expand Up @@ -217,7 +217,7 @@ macro_rules! invoke_binder_maker_macro_with_type {
$this,
$consume_v,
$fn,
|v| Ok(Some(Text(ptr_to_cstr(v).unwrap().to_string()))),
|v| Ok(Some(Text(unsafe { ptr_to_cstr(v) }.unwrap().to_string()))),
[v @ *const std::os::raw::c_char]
);
};
Expand All @@ -226,7 +226,7 @@ macro_rules! invoke_binder_maker_macro_with_type {
$this,
$consume_v,
$fn,
|v, n| Ok(Some(Text(ptr_to_cstr_n(v, n).unwrap().to_string()))),
|v, n| Ok(Some(Text(unsafe { ptr_to_cstr_n(v, n) }.unwrap().to_string()))),
[v @ *const std::os::raw::c_char, n @ size_t]
);
};
Expand All @@ -236,7 +236,7 @@ macro_rules! invoke_binder_maker_macro_with_type {
$consume_v,
$fn,
|v, v_size| {
let v_vec = std::slice::from_raw_parts(v, v_size as usize).to_vec();
let v_vec = unsafe { std::slice::from_raw_parts(v, v_size as usize) }.to_vec();
Ok(Some(Blob(v_vec)))
},
[v @ *const cass_byte_t, v_size @ size_t]
Expand Down Expand Up @@ -291,7 +291,7 @@ macro_rules! invoke_binder_maker_macro_with_type {
$fn,
|v, v_size, scale| {
use scylla::value::CqlDecimal;
let varint = std::slice::from_raw_parts(v, v_size as usize);
let varint = unsafe { std::slice::from_raw_parts(v, v_size as usize) };
Ok(Some(Decimal(CqlDecimal::from_signed_be_bytes_slice_and_exponent(varint, scale))))
},
[v @ *const cass_byte_t, v_size @ size_t, scale @ cass_int32_t]
Expand Down
87 changes: 46 additions & 41 deletions scylla-rust-wrapper/src/cass_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,12 @@ unsafe impl Sync for CassDataType {}

impl CassDataType {
pub unsafe fn get_unchecked(&self) -> &CassDataTypeInner {
&*self.0.get()
unsafe { &*self.0.get() }
}

#[allow(clippy::mut_from_ref)]
pub unsafe fn get_mut_unchecked(&self) -> &mut CassDataTypeInner {
&mut *self.0.get()
unsafe { &mut *self.0.get() }
}

pub const fn new(inner: CassDataTypeInner) -> CassDataType {
Expand Down Expand Up @@ -479,7 +479,9 @@ pub unsafe extern "C" fn cass_data_type_new_from_existing(
data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> CassOwnedSharedPtr<CassDataType, CMut> {
let data_type = ArcFFI::as_ref(data_type).unwrap();
ArcFFI::into_ptr(CassDataType::new_arced(data_type.get_unchecked().clone()))
ArcFFI::into_ptr(CassDataType::new_arced(
unsafe { data_type.get_unchecked() }.clone(),
))
}

#[no_mangle]
Expand Down Expand Up @@ -510,15 +512,15 @@ pub unsafe extern "C" fn cass_data_type_type(
data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> CassValueType {
let data_type = ArcFFI::as_ref(data_type).unwrap();
data_type.get_unchecked().get_value_type()
unsafe { data_type.get_unchecked() }.get_value_type()
}

#[no_mangle]
pub unsafe extern "C" fn cass_data_type_is_frozen(
data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> cass_bool_t {
let data_type = ArcFFI::as_ref(data_type).unwrap();
let is_frozen = match data_type.get_unchecked() {
let is_frozen = match unsafe { data_type.get_unchecked() } {
CassDataTypeInner::UDT(udt) => udt.frozen,
CassDataTypeInner::List { frozen, .. } => *frozen,
CassDataTypeInner::Set { frozen, .. } => *frozen,
Expand All @@ -536,9 +538,9 @@ pub unsafe extern "C" fn cass_data_type_type_name(
type_name_length: *mut size_t,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type).unwrap();
match data_type.get_unchecked() {
match unsafe { data_type.get_unchecked() } {
CassDataTypeInner::UDT(UDTDataType { name, .. }) => {
write_str_to_c(name, type_name, type_name_length);
unsafe { write_str_to_c(name, type_name, type_name_length) };
CassError::CASS_OK
}
_ => CassError::CASS_ERROR_LIB_INVALID_VALUE_TYPE,
Expand All @@ -550,7 +552,7 @@ pub unsafe extern "C" fn cass_data_type_set_type_name(
data_type: CassBorrowedSharedPtr<CassDataType, CMut>,
type_name: *const c_char,
) -> CassError {
cass_data_type_set_type_name_n(data_type, type_name, strlen(type_name))
unsafe { cass_data_type_set_type_name_n(data_type, type_name, strlen(type_name)) }
}

#[no_mangle]
Expand All @@ -560,11 +562,11 @@ pub unsafe extern "C" fn cass_data_type_set_type_name_n(
type_name_length: size_t,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type_raw).unwrap();
let type_name_string = ptr_to_cstr_n(type_name, type_name_length)
let type_name_string = unsafe { ptr_to_cstr_n(type_name, type_name_length) }
.unwrap()
.to_string();

match data_type.get_mut_unchecked() {
match unsafe { data_type.get_mut_unchecked() } {
CassDataTypeInner::UDT(udt_data_type) => {
udt_data_type.name = type_name_string;
CassError::CASS_OK
Expand All @@ -580,9 +582,9 @@ pub unsafe extern "C" fn cass_data_type_keyspace(
keyspace_length: *mut size_t,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type).unwrap();
match data_type.get_unchecked() {
match unsafe { data_type.get_unchecked() } {
CassDataTypeInner::UDT(UDTDataType { name, .. }) => {
write_str_to_c(name, keyspace, keyspace_length);
unsafe { write_str_to_c(name, keyspace, keyspace_length) };
CassError::CASS_OK
}
_ => CassError::CASS_ERROR_LIB_INVALID_VALUE_TYPE,
Expand All @@ -594,7 +596,7 @@ pub unsafe extern "C" fn cass_data_type_set_keyspace(
data_type: CassBorrowedSharedPtr<CassDataType, CMut>,
keyspace: *const c_char,
) -> CassError {
cass_data_type_set_keyspace_n(data_type, keyspace, strlen(keyspace))
unsafe { cass_data_type_set_keyspace_n(data_type, keyspace, strlen(keyspace)) }
}

#[no_mangle]
Expand All @@ -604,11 +606,11 @@ pub unsafe extern "C" fn cass_data_type_set_keyspace_n(
keyspace_length: size_t,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type).unwrap();
let keyspace_string = ptr_to_cstr_n(keyspace, keyspace_length)
let keyspace_string = unsafe { ptr_to_cstr_n(keyspace, keyspace_length) }
.unwrap()
.to_string();

match data_type.get_mut_unchecked() {
match unsafe { data_type.get_mut_unchecked() } {
CassDataTypeInner::UDT(udt_data_type) => {
udt_data_type.keyspace = keyspace_string;
CassError::CASS_OK
Expand All @@ -624,9 +626,9 @@ pub unsafe extern "C" fn cass_data_type_class_name(
class_name_length: *mut size_t,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type).unwrap();
match data_type.get_unchecked() {
match unsafe { data_type.get_unchecked() } {
CassDataTypeInner::Custom(name) => {
write_str_to_c(name, class_name, class_name_length);
unsafe { write_str_to_c(name, class_name, class_name_length) };
CassError::CASS_OK
}
_ => CassError::CASS_ERROR_LIB_INVALID_VALUE_TYPE,
Expand All @@ -638,7 +640,7 @@ pub unsafe extern "C" fn cass_data_type_set_class_name(
data_type: CassBorrowedSharedPtr<CassDataType, CMut>,
class_name: *const ::std::os::raw::c_char,
) -> CassError {
cass_data_type_set_class_name_n(data_type, class_name, strlen(class_name))
unsafe { cass_data_type_set_class_name_n(data_type, class_name, strlen(class_name)) }
}

#[no_mangle]
Expand All @@ -648,10 +650,10 @@ pub unsafe extern "C" fn cass_data_type_set_class_name_n(
class_name_length: size_t,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type).unwrap();
let class_string = ptr_to_cstr_n(class_name, class_name_length)
let class_string = unsafe { ptr_to_cstr_n(class_name, class_name_length) }
.unwrap()
.to_string();
match data_type.get_mut_unchecked() {
match unsafe { data_type.get_mut_unchecked() } {
CassDataTypeInner::Custom(name) => {
*name = class_string;
CassError::CASS_OK
Expand All @@ -665,7 +667,7 @@ pub unsafe extern "C" fn cass_data_type_sub_type_count(
data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> size_t {
let data_type = ArcFFI::as_ref(data_type).unwrap();
match data_type.get_unchecked() {
match unsafe { data_type.get_unchecked() } {
CassDataTypeInner::Value(..) => 0,
CassDataTypeInner::UDT(udt_data_type) => udt_data_type.field_types.len() as size_t,
CassDataTypeInner::List { typ, .. } | CassDataTypeInner::Set { typ, .. } => {
Expand All @@ -685,7 +687,7 @@ pub unsafe extern "C" fn cass_data_type_sub_type_count(
pub unsafe extern "C" fn cass_data_sub_type_count(
data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> size_t {
cass_data_type_sub_type_count(data_type)
unsafe { cass_data_type_sub_type_count(data_type) }
}

#[no_mangle]
Expand All @@ -695,7 +697,7 @@ pub unsafe extern "C" fn cass_data_type_sub_data_type(
) -> CassBorrowedSharedPtr<CassDataType, CConst> {
let data_type = ArcFFI::as_ref(data_type).unwrap();
let sub_type: Option<&Arc<CassDataType>> =
data_type.get_unchecked().get_sub_data_type(index as usize);
unsafe { data_type.get_unchecked() }.get_sub_data_type(index as usize);

match sub_type {
None => ArcFFI::null(),
Expand All @@ -709,7 +711,7 @@ pub unsafe extern "C" fn cass_data_type_sub_data_type_by_name(
data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
name: *const ::std::os::raw::c_char,
) -> CassBorrowedSharedPtr<CassDataType, CConst> {
cass_data_type_sub_data_type_by_name_n(data_type, name, strlen(name))
unsafe { cass_data_type_sub_data_type_by_name_n(data_type, name, strlen(name)) }
}

#[no_mangle]
Expand All @@ -719,8 +721,8 @@ pub unsafe extern "C" fn cass_data_type_sub_data_type_by_name_n(
name_length: size_t,
) -> CassBorrowedSharedPtr<CassDataType, CConst> {
let data_type = ArcFFI::as_ref(data_type).unwrap();
let name_str = ptr_to_cstr_n(name, name_length).unwrap();
match data_type.get_unchecked() {
let name_str = unsafe { ptr_to_cstr_n(name, name_length) }.unwrap();
match unsafe { data_type.get_unchecked() } {
CassDataTypeInner::UDT(udt) => match udt.get_field_by_name(name_str) {
None => ArcFFI::null(),
Some(t) => ArcFFI::as_ptr(t),
Expand All @@ -737,11 +739,11 @@ pub unsafe extern "C" fn cass_data_type_sub_type_name(
name_length: *mut size_t,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type).unwrap();
match data_type.get_unchecked() {
match unsafe { data_type.get_unchecked() } {
CassDataTypeInner::UDT(udt) => match udt.field_types.get(index as usize) {
None => CassError::CASS_ERROR_LIB_INDEX_OUT_OF_BOUNDS,
Some((field_name, _)) => {
write_str_to_c(field_name, name, name_length);
unsafe { write_str_to_c(field_name, name, name_length) };
CassError::CASS_OK
}
},
Expand All @@ -755,8 +757,7 @@ pub unsafe extern "C" fn cass_data_type_add_sub_type(
sub_data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> CassError {
let data_type = ArcFFI::as_ref(data_type).unwrap();
match data_type
.get_mut_unchecked()
match unsafe { data_type.get_mut_unchecked() }
.add_sub_data_type(ArcFFI::cloned_from_ptr(sub_data_type).unwrap())
{
Ok(()) => CassError::CASS_OK,
Expand All @@ -770,7 +771,7 @@ pub unsafe extern "C" fn cass_data_type_add_sub_type_by_name(
name: *const c_char,
sub_data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> CassError {
cass_data_type_add_sub_type_by_name_n(data_type, name, strlen(name), sub_data_type)
unsafe { cass_data_type_add_sub_type_by_name_n(data_type, name, strlen(name), sub_data_type) }
}

#[no_mangle]
Expand All @@ -780,11 +781,13 @@ pub unsafe extern "C" fn cass_data_type_add_sub_type_by_name_n(
name_length: size_t,
sub_data_type_raw: CassBorrowedSharedPtr<CassDataType, CConst>,
) -> CassError {
let name_string = ptr_to_cstr_n(name, name_length).unwrap().to_string();
let name_string = unsafe { ptr_to_cstr_n(name, name_length) }
.unwrap()
.to_string();
let sub_data_type = ArcFFI::cloned_from_ptr(sub_data_type_raw).unwrap();

let data_type = ArcFFI::as_ref(data_type_raw).unwrap();
match data_type.get_mut_unchecked() {
match unsafe { data_type.get_mut_unchecked() } {
CassDataTypeInner::UDT(udt_data_type) => {
// The Cpp Driver does not check whether field_types size
// exceeded field_count.
Expand All @@ -801,7 +804,7 @@ pub unsafe extern "C" fn cass_data_type_add_sub_value_type(
sub_value_type: CassValueType,
) -> CassError {
let sub_data_type = CassDataType::new_arced(CassDataTypeInner::Value(sub_value_type));
cass_data_type_add_sub_type(data_type, ArcFFI::as_ptr(&sub_data_type))
unsafe { cass_data_type_add_sub_type(data_type, ArcFFI::as_ptr(&sub_data_type)) }
}

#[no_mangle]
Expand All @@ -811,7 +814,7 @@ pub unsafe extern "C" fn cass_data_type_add_sub_value_type_by_name(
sub_value_type: CassValueType,
) -> CassError {
let sub_data_type = CassDataType::new_arced(CassDataTypeInner::Value(sub_value_type));
cass_data_type_add_sub_type_by_name(data_type, name, ArcFFI::as_ptr(&sub_data_type))
unsafe { cass_data_type_add_sub_type_by_name(data_type, name, ArcFFI::as_ptr(&sub_data_type)) }
}

#[no_mangle]
Expand All @@ -822,12 +825,14 @@ pub unsafe extern "C" fn cass_data_type_add_sub_value_type_by_name_n(
sub_value_type: CassValueType,
) -> CassError {
let sub_data_type = CassDataType::new_arced(CassDataTypeInner::Value(sub_value_type));
cass_data_type_add_sub_type_by_name_n(
data_type,
name,
name_length,
ArcFFI::as_ptr(&sub_data_type),
)
unsafe {
cass_data_type_add_sub_type_by_name_n(
data_type,
name,
name_length,
ArcFFI::as_ptr(&sub_data_type),
)
}
}

impl TryFrom<CassConsistency> for Consistency {
Expand Down
Loading