mod: introduce cass_uuid_types module

Author: muzarski

scylla-rust-wrapper/build.rs

@@ -132,7 +132,7 @@ fn main() {
         &out_path,
     );
     prepare_cppdriver_data(
-        "cppdriver_data_uuid.rs",
+        "cppdriver_uuid_types.rs",
         &["CassUuid_", "CassUuid"],
         &out_path,
     );

scylla-rust-wrapper/src/lib.rs

@@ -91,6 +91,18 @@ pub mod cass_log_types {
     include!(concat!(env!("OUT_DIR"), "/cppdriver_log_types.rs"));
 }
 
+/// CassColumnType
+pub mod cass_column_types {
+    include!(concat!(env!("OUT_DIR"), "/cppdriver_column_type.rs"));
+}
+
+/// CassUuid
+pub mod cass_uuid_types {
+    #![allow(non_camel_case_types, non_snake_case)]
+
+    include!(concat!(env!("OUT_DIR"), "/cppdriver_uuid_types.rs"));
+}
+
 lazy_static! {
     pub static ref RUNTIME: Runtime = Runtime::new().unwrap();
     pub static ref LOGGER: RwLock<Logger> = RwLock::new(Logger {

scylla-rust-wrapper/src/metadata.rs

@@ -1,4 +1,5 @@
 use crate::argconv::*;
+use crate::cass_column_types::CassColumnType;
 use crate::cass_types::get_column_type_from_cql_type;
 use crate::cass_types::CassDataType;
 use crate::types::*;
@@ -8,8 +9,6 @@ use std::os::raw::c_char;
 use std::sync::Arc;
 use std::sync::Weak;
 
-include!(concat!(env!("OUT_DIR"), "/cppdriver_column_type.rs"));
-
 pub struct CassSchemaMeta {
     pub keyspaces: HashMap<String, CassKeyspaceMeta>,
 }

scylla-rust-wrapper/src/uuid.rs

@@ -1,4 +1,3 @@
-#![allow(non_camel_case_types, non_snake_case)]
 use crate::argconv::*;
 use crate::cass_error::CassError;
 use crate::types::*;
@@ -11,7 +10,7 @@ use std::sync::atomic::{AtomicU64, Ordering};
 use std::time::{SystemTime, UNIX_EPOCH};
 use uuid::Uuid;
 
-include!(concat!(env!("OUT_DIR"), "/cppdriver_data_uuid.rs"));
+pub(crate) use crate::cass_uuid_types::CassUuid;
 
 pub struct CassUuidGen {
     pub clock_seq_and_node: cass_uint64_t,