Merge pull request #333 from wprzytula/expose-public-rust-api

Expose public rust API & enable API lints

Author: wprzytula

scylla-rust-wrapper/Cargo.toml

@@ -60,6 +60,8 @@ strip = "none"
 
 [lints.rust]
 unsafe-op-in-unsafe-fn = "warn"
+unnameable_types = "warn"
+unreachable_pub = "warn"
 unexpected_cfgs = { level = "warn", check-cfg = [
     'cfg(cpp_integration_testing)',
 ] }

scylla-rust-wrapper/src/api.rs

@@ -76,6 +76,9 @@ macro_rules! make_c_str {
 pub(crate) use make_c_str;
 
 mod sealed {
+    // This is a sealed trait - its whole purpose is to be unnameable.
+    // This means we need to disable the check.
+    #[expect(unnameable_types)]
     pub trait Sealed {}
 }
 
@@ -330,8 +333,19 @@ impl<T: Sized> CassPtr<'_, T, (Exclusive, CMut)> {
 }
 
 mod origin_sealed {
+    // This is a sealed trait - its whole purpose is to be unnameable.
+    // This means we need to disable the check.
+    #[expect(unnameable_types)]
     pub trait FromBoxSealed {}
+
+    // This is a sealed trait - its whole purpose is to be unnameable.
+    // This means we need to disable the check.
+    #[expect(unnameable_types)]
     pub trait FromArcSealed {}
+
+    // This is a sealed trait - its whole purpose is to be unnameable.
+    // This means we need to disable the check.
+    #[expect(unnameable_types)]
     pub trait FromRefSealed {}
 }
 
@@ -414,7 +428,7 @@ pub trait BoxFFI: Sized + origin_sealed::FromBoxSealed {
 /// The data should be allocated via [`Arc::new`], and then returned to the user as a pointer.
 /// The user is responsible for freeing the memory associated
 /// with the pointer using corresponding driver's API function.
-pub(crate) trait ArcFFI: Sized + origin_sealed::FromArcSealed {
+pub trait ArcFFI: Sized + origin_sealed::FromArcSealed {
     /// Creates a pointer from a valid reference to Arc-allocated data.
     /// Holder of the pointer borrows the pointee.
     #[allow(clippy::needless_lifetimes)]

scylla-rust-wrapper/src/argconv.rs

@@ -3,7 +3,8 @@ use crate::argconv::{
     FFI, FromBox,
 };
 use crate::cass_error::CassError;
-use crate::cass_types::{CassBatchType, CassConsistency, make_batch_type};
+pub use crate::cass_types::CassBatchType;
+use crate::cass_types::{CassConsistency, make_batch_type};
 use crate::config_value::MaybeUnsetConfig;
 use crate::exec_profile::PerStatementExecProfile;
 use crate::retry_policy::CassRetryPolicy;

scylla-rust-wrapper/src/batch.rs

@@ -1,7 +1,7 @@
 use scylla::errors::*;
 
 // Re-export error types.
-pub(crate) use crate::cass_error_types::{CassError, CassErrorSource};
+pub use crate::cass_error_types::{CassError, CassErrorSource};
 use crate::execution_error::CassErrorResult;
 use crate::statement::UnknownNamedParameterError;
 

scylla-rust-wrapper/src/cass_error.rs

@@ -8,9 +8,9 @@ use std::cell::UnsafeCell;
 use std::os::raw::c_char;
 use std::sync::Arc;
 
-pub(crate) use crate::cass_batch_types::CassBatchType;
-pub(crate) use crate::cass_consistency_types::CassConsistency;
-pub(crate) use crate::cass_data_types::CassValueType;
+pub use crate::cass_batch_types::CassBatchType;
+pub use crate::cass_consistency_types::CassConsistency;
+pub use crate::cass_data_types::CassValueType;
 
 #[derive(Clone, Debug)]
 #[cfg_attr(test, derive(PartialEq, Eq))]

scylla-rust-wrapper/src/cass_types.rs

@@ -154,7 +154,7 @@ pub unsafe extern "C" fn cass_collection_new(
 }
 
 #[unsafe(no_mangle)]
-unsafe extern "C" fn cass_collection_new_from_data_type(
+pub unsafe extern "C" fn cass_collection_new_from_data_type(
     data_type: CassBorrowedSharedPtr<CassDataType, CConst>,
     item_count: size_t,
 ) -> CassOwnedExclusivePtr<CassCollection, CMut> {
@@ -185,7 +185,7 @@ unsafe extern "C" fn cass_collection_new_from_data_type(
 }
 
 #[unsafe(no_mangle)]
-unsafe extern "C" fn cass_collection_data_type(
+pub unsafe extern "C" fn cass_collection_data_type(
     collection: CassBorrowedSharedPtr<CassCollection, CConst>,
 ) -> CassBorrowedSharedPtr<CassDataType, CConst> {
     let Some(collection_ref) = BoxFFI::as_ref(collection) else {

scylla-rust-wrapper/src/collection.rs

@@ -1,5 +1,6 @@
 use crate::argconv::*;
 use crate::cass_error::*;
+pub use crate::cass_error::{CassError, CassErrorSource};
 use crate::cass_error_types::CassWriteType;
 use crate::cass_types::CassConsistency;
 use crate::types::*;

scylla-rust-wrapper/src/execution_error.rs

@@ -17,7 +17,7 @@ use tokio::task::JoinHandle;
 use tokio::time::Duration;
 
 #[derive(Debug)]
-pub enum CassResultValue {
+pub(crate) enum CassResultValue {
     Empty,
     QueryResult(Arc<CassResult>),
     QueryError(Arc<CassErrorResult>),
@@ -26,7 +26,7 @@ pub enum CassResultValue {
 
 type CassFutureError = (CassError, String);
 
-pub type CassFutureResult = Result<CassResultValue, CassFutureError>;
+pub(crate) type CassFutureResult = Result<CassResultValue, CassFutureError>;
 
 pub type CassFutureCallback = Option<
     unsafe extern "C" fn(future: CassBorrowedSharedPtr<CassFuture, CMut>, data: *mut c_void),

scylla-rust-wrapper/src/future.rs

@@ -9,12 +9,12 @@ use std::os::raw::c_char;
 use std::slice::from_raw_parts;
 use std::str::FromStr;
 
-pub(crate) use crate::cass_inet_types::CassInet;
+pub use crate::cass_inet_types::CassInet;
 
 #[repr(u8)] // address_length field in CassInet is cass_uint8_t
 #[allow(non_camel_case_types)]
 #[derive(Debug, Copy, Clone)]
-pub enum CassInetLength {
+pub(crate) enum CassInetLength {
     CASS_INET_V4 = 4,
     CASS_INET_V6 = 16,
 }