mod: introduce cass_log_types module

Author: muzarski

scylla-rust-wrapper/build.rs

@@ -110,7 +110,7 @@ fn main() {
         &out_path,
     );
     prepare_cppdriver_data(
-        "cppdriver_log.rs",
+        "cppdriver_log_types.rs",
         &[
             "CassLogLevel_",
             "CassLogLevel",

scylla-rust-wrapper/src/lib.rs

@@ -79,6 +79,13 @@ pub mod cass_inet_types {
     include!(concat!(env!("OUT_DIR"), "/cppdriver_inet_types.rs"));
 }
 
+/// CassLogLevel, CassLogMessage
+pub mod cass_log_types {
+    #![allow(non_camel_case_types, non_snake_case)]
+
+    include!(concat!(env!("OUT_DIR"), "/cppdriver_log_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/logging.rs

@@ -1,4 +1,5 @@
 use crate::argconv::{arr_to_cstr, ptr_to_cstr, ptr_to_ref, str_to_arr};
+use crate::cass_log_types::{CassLogLevel, CassLogMessage};
 use crate::types::size_t;
 use crate::LOGGER;
 use std::convert::TryFrom;
@@ -13,12 +14,6 @@ use tracing_subscriber::layer::Context;
 use tracing_subscriber::prelude::*;
 use tracing_subscriber::Layer;
 
-mod cass_log {
-    #![allow(non_camel_case_types, non_snake_case)]
-    include!(concat!(env!("OUT_DIR"), "/cppdriver_log.rs"));
-}
-use cass_log::*;
-
 pub type CassLogCallback =
     Option<unsafe extern "C" fn(message: *const CassLogMessage, data: *mut c_void)>;