rebase fixes

Author: martinzink

minifi_rust/minifi_native/src/c_ffi/c_ffi_controller_service_definition.rs

@@ -7,27 +7,27 @@ use crate::{
     LogLevel, Property, ProvidedInterface,
 };
 use minifi_native_sys::{
-    minifi_controller_service_callbacks, minifi_controller_service_class_definition,
+    minifi_controller_service_callbacks, minifi_controller_service_definition,
     minifi_controller_service_context, minifi_controller_service_metadata, minifi_status,
     minifi_string_view,
 };
 use std::ffi::c_void;
 
 #[derive(Debug)]
 pub struct ControllerServiceClassDefinition<'a> {
-    inner: minifi_controller_service_class_definition,
+    inner: minifi_controller_service_definition,
     _lifetime: std::marker::PhantomData<&'a ()>,
 }
 
 impl<'a> ControllerServiceClassDefinition<'a> {
-    pub(crate) fn new(inner: minifi_controller_service_class_definition) -> Self {
+    pub(crate) fn new(inner: minifi_controller_service_definition) -> Self {
         Self {
             inner,
             _lifetime: std::marker::PhantomData,
         }
     }
 
-    pub unsafe fn as_raw(&self) -> minifi_controller_service_class_definition {
+    pub unsafe fn as_raw(&self) -> minifi_controller_service_definition {
         self.inner
     }
 }
@@ -152,7 +152,7 @@ where
 {
     fn class_description(&'_ self) -> ControllerServiceClassDefinition<'_> {
         unsafe {
-            ControllerServiceClassDefinition::new(minifi_controller_service_class_definition {
+            ControllerServiceClassDefinition::new(minifi_controller_service_definition {
                 full_name: self.name.as_minifi_c_type(),
                 description: self.description_text.as_minifi_c_type(),
                 properties_count: self.c_properties.len(),

minifi_rust/minifi_native/src/c_ffi/c_ffi_controller_service_list.rs

@@ -1,11 +1,11 @@
 use crate::c_ffi::RegisterableControllerService;
 use crate::c_ffi::c_ffi_controller_service_definition::DynRawControllerServiceDefinition;
-use minifi_native_sys::minifi_controller_service_class_definition;
+use minifi_native_sys::minifi_controller_service_definition;
 
 pub struct CffiControllerServiceList {
     controller_service_definitions: Vec<Box<dyn DynRawControllerServiceDefinition>>,
     minifi_controller_service_class_description_list:
-        Vec<minifi_controller_service_class_definition>,
+        Vec<minifi_controller_service_definition>,
 }
 
 impl Default for CffiControllerServiceList {
@@ -53,11 +53,11 @@ impl CffiControllerServiceList {
 
     /// # Safety
     ///
-    /// The returned *minifi_controller_service_class_definition only valid until self lives
+    /// The returned *minifi_controller_service_definition only valid until self lives
     /// TODO(mzink) maybe some lifetimes?
     pub unsafe fn get_controller_service_ptr(
         &self,
-    ) -> *const minifi_controller_service_class_definition {
+    ) -> *const minifi_controller_service_definition {
         self.minifi_controller_service_class_description_list
             .as_ptr()
     }

minifi_rust/minifi_native/src/c_ffi/c_ffi_processor_definition.rs

@@ -184,19 +184,19 @@ where
 
 #[derive(Debug)]
 pub struct ProcessorClassDefinition<'a> {
-    inner: minifi_processor_class_definition,
+    inner: minifi_processor_definition,
     _marker: std::marker::PhantomData<&'a ()>,
 }
 
 impl<'a> ProcessorClassDefinition<'a> {
-    pub(crate) fn new(inner: minifi_processor_class_definition) -> Self {
+    pub(crate) fn new(inner: minifi_processor_definition) -> Self {
         Self {
             inner,
             _marker: std::marker::PhantomData,
         }
     }
 
-    pub unsafe fn as_raw(&self) -> minifi_processor_class_definition {
+    pub unsafe fn as_raw(&self) -> minifi_processor_definition {
         self.inner
     }
 }
@@ -211,7 +211,7 @@ where
 {
     fn class_description(&'_ self) -> ProcessorClassDefinition<'_> {
         unsafe {
-            ProcessorClassDefinition::new(minifi_processor_class_definition {
+            ProcessorClassDefinition::new(minifi_processor_definition {
                 full_name: self.name.as_minifi_c_type(),
                 description: self.description_text.as_minifi_c_type(),
                 properties_count: self.c_properties.len(),

minifi_rust/minifi_native/src/c_ffi/c_ffi_processor_list.rs

@@ -1,10 +1,10 @@
 use crate::c_ffi::RawRegisterableProcessor;
 use crate::c_ffi::c_ffi_processor_definition::DynRawProcessorDefinition;
-use minifi_native_sys::minifi_processor_class_definition;
+use minifi_native_sys::minifi_processor_definition;
 
 pub struct CffiProcessorList {
     processor_definitions: Vec<Box<dyn DynRawProcessorDefinition>>,
-    minifi_processor_class_description_list: Vec<minifi_processor_class_definition>,
+    minifi_processor_class_description_list: Vec<minifi_processor_definition>,
 }
 
 impl Default for CffiProcessorList {
@@ -51,9 +51,9 @@ impl CffiProcessorList {
 
     /// # Safety
     ///
-    /// The returned *minifi_processor_class_definition only valid until self lives
+    /// The returned *minifi_processor_definition only valid until self lives
     /// TODO(mzink) maybe some lifetimes?
-    pub unsafe fn get_processor_ptr(&self) -> *const minifi_processor_class_definition {
+    pub unsafe fn get_processor_ptr(&self) -> *const minifi_processor_definition {
         self.minifi_processor_class_description_list.as_ptr()
     }
 }