Replace derivative crate by derive_more

lib/Cargo.toml

@@ -58,7 +58,7 @@ serde_json = { version = "1.0", features = ["arbitrary_precision"] }
 bytes = "1.3"
 url = "1.6"
 bitflags = "2.4"
-derivative = "2.2"
+derive_more = { version = "2.0.1", features = ["debug"] }
 byteorder = "1.4"
 base64 = "0.21"
 uuid = { version = "1.2", features = ["v4"] }

lib/src/lib.rs

@@ -12,8 +12,6 @@ extern crate serde_derive;
 extern crate actix_web;
 #[cfg(test)]
 extern crate serde_json;
-#[macro_use]
-extern crate derivative;
 
 // Synchronization structs. This is a wrapper mod around `parking_lot` types so opcua users don't have
 // to reference that other crate.

lib/src/server/address_space/method.rs

@@ -6,15 +6,16 @@
 
 use std::sync::Arc;
 
-use crate::sync::*;
-use crate::types::service_types::{Argument, MethodAttributes};
+use derive_more::Debug;
 
 use super::{
     address_space::MethodCallback,
     base::Base,
     node::{Node, NodeBase},
     variable::VariableBuilder,
 };
+use crate::sync::*;
+use crate::types::service_types::{Argument, MethodAttributes};
 
 use crate::server::session::SessionManager;
 
@@ -76,13 +77,12 @@ impl MethodBuilder {
 }
 
 /// A `Method` is a type of node within the `AddressSpace`.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(Debug)]
 pub struct Method {
     base: Base,
     executable: bool,
     user_executable: bool,
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     callback: Option<MethodCallback>,
 }
 

lib/src/server/address_space/variable.rs

@@ -7,6 +7,8 @@
 use std::convert::{Into, TryFrom};
 use std::sync::Arc;
 
+use derive_more::Debug;
+
 use crate::sync::*;
 use crate::types::service_types::VariableAttributes;
 
@@ -149,11 +151,10 @@ impl VariableBuilder {
     }
 }
 
-// Note we use derivative builder macro so we can skip over the value getter / setter
+// Note we use derive_more builder macro so we can skip over the value getter / setter
 
 /// A `Variable` is a type of node within the `AddressSpace`.
-#[derive(Derivative)]
-#[derivative(Debug)]
+#[derive(Debug)]
 pub struct Variable {
     base: Base,
     data_type: NodeId,
@@ -164,9 +165,9 @@ pub struct Variable {
     user_access_level: u8,
     array_dimensions: Option<Vec<u32>>,
     minimum_sampling_interval: Option<f64>,
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     value_setter: Option<Arc<Mutex<dyn AttributeSetter + Send>>>,
-    #[derivative(Debug = "ignore")]
+    #[debug(skip)]
     value_getter: Option<Arc<Mutex<dyn AttributeGetter + Send>>>,
 }