feat: refine macros for comprehensive member accessor codegen

examples/async_call.rs

@@ -223,7 +223,7 @@ fn get_arguments(value: &DataValue<ua::Variant>) -> anyhow::Result<Vec<(ua::Stri
 /// Returns `None` for non-property references.
 fn property_name(reference: &ua::ReferenceDescription) -> Option<&str> {
     // TODO: Add methods for these checks?
-    (reference.node_class() == &ua::NodeClass::VARIABLE
+    (reference.node_class() == ua::NodeClass::VARIABLE
         && reference.reference_type_id().as_ns0() == Some(UA_NS0ID_HASPROPERTY)
         && reference.type_definition().node_id().as_ns0() == Some(UA_NS0ID_PROPERTYTYPE))
     .then(|| {

src/async_client.rs

@@ -121,7 +121,7 @@ impl AsyncClient {
                 self.client.as_ptr().cast_mut(),
             )
         });
-        if let Err(error) = Error::verify_good(&status_code) {
+        if let Err(error) = Error::verify_good(status_code) {
             log::warn!("Error while disconnecting client: {error}");
         }
 
@@ -251,9 +251,9 @@ impl AsyncClient {
             .with_timestamps_to_return(&ua::TimestampsToReturn::BOTH)
             .with_nodes_to_read(&nodes_to_read);
 
-        let response = self.service_request(request).await?;
+        let mut response = self.service_request(request).await?;
 
-        let Some(mut results) = response.results() else {
+        let Some(mut results) = response.take_results() else {
             return Err(Error::internal("read should return results"));
         };
 
@@ -290,11 +290,11 @@ impl AsyncClient {
             return Err(Error::internal("write should return results"));
         };
 
-        let Some(result) = results.as_slice().first() else {
+        let Some(result) = results.first() else {
             return Err(Error::internal("write should return a result"));
         };
 
-        Error::verify_good(result)?;
+        Error::verify_good(*result)?;
 
         Ok(())
     }
@@ -317,19 +317,19 @@ impl AsyncClient {
                 .with_method_id(method_id)
                 .with_input_arguments(input_arguments)]);
 
-        let response = self.service_request(request).await?;
+        let mut response = self.service_request(request).await?;
 
-        let Some(results) = response.results() else {
+        let Some(mut results) = response.take_results() else {
             return Err(Error::internal("call should return results"));
         };
 
-        let Some(result) = results.as_slice().first() else {
+        let Some(result) = results.as_slice_mut().first_mut() else {
             return Err(Error::internal("call should return a result"));
         };
 
-        Error::verify_good(&result.status_code())?;
+        Error::verify_good(result.status_code())?;
 
-        let output_arguments = if let Some(output_arguments) = result.output_arguments() {
+        let output_arguments = if let Some(output_arguments) = result.take_output_arguments() {
             output_arguments.into_vec()
         } else {
             log::debug!("Calling {method_id} returned unset output arguments, assuming none exist");
@@ -364,9 +364,9 @@ impl AsyncClient {
         let request =
             ua::BrowseRequest::init().with_nodes_to_browse(slice::from_ref(browse_description));
 
-        let response = self.service_request(request).await?;
+        let mut response = self.service_request(request).await?;
 
-        let Some(results) = response.results() else {
+        let Some(results) = response.take_results() else {
             return Err(Error::internal("browse should return results"));
         };
 
@@ -547,7 +547,7 @@ impl AsyncClient {
         // The request itself fails when the client is not connected (or the secure session has not been
         // established). In all other cases, `open62541` processes the request first and then may reject
         // it only through the response when executing our callback above.
-        Error::verify_good(&status_code).inspect_err(|_| {
+        Error::verify_good(status_code).inspect_err(|_| {
             log::warn!("{} failed: {status_code:?}", R::type_name());
         })?;
 
@@ -827,9 +827,9 @@ fn background_task(client: &ua::Client, state: &AtomicU8) {
         let time_taken = start_of_iteration.elapsed();
         log::trace!("Iterate run took {time_taken:?}");
 
-        if let Err(error) = Error::verify_good(&connect_status) {
+        if let Err(error) = Error::verify_good(connect_status) {
             let not_connected = matches!(
-                connect_status.clone().into_raw(),
+                connect_status.code(),
                 UA_STATUSCODE_BADDISCONNECT
                     | UA_STATUSCODE_BADCONNECTIONCLOSED
                     | UA_STATUSCODE_BADCONNECTIONREJECTED
@@ -870,10 +870,10 @@ fn background_task(client: &ua::Client, state: &AtomicU8) {
 fn to_browse_result(result: &ua::BrowseResult, node_id: Option<&ua::NodeId>) -> BrowseResult {
     // Make sure to verify the inner status code inside `BrowseResult`. The service request finishes
     // without error, even when browsing the node has failed.
-    Error::verify_good(&result.status_code())?;
+    Error::verify_good(result.status_code())?;
 
     let references = if let Some(references) = result.references() {
-        references.into_vec()
+        references.to_vec()
     } else {
         // When no references exist, some OPC UA servers do not return an empty references array but
         // an invalid (unset) one instead, e.g. Siemens SIMOTION. We treat it as an empty array, and

src/async_subscription.rs

@@ -319,7 +319,7 @@ async fn create_subscription(
             )
         }
     });
-    Error::verify_good(&status_code)?;
+    Error::verify_good(status_code)?;
 
     // PANIC: When `callback` is called (which owns `tx`), we always call `tx.send()`. So the sender
     // is only dropped after placing a value into the channel and `rx.await` always finds this value
@@ -342,7 +342,7 @@ fn delete_subscriptions(client: &ua::Client, request: &ua::DeleteSubscriptionsRe
         let response = unsafe { response.as_ref() }.expect("response should be set");
         let status_code = ua::StatusCode::new(response.responseHeader.serviceResult);
 
-        if let Err(error) = Error::verify_good(&status_code) {
+        if let Err(error) = Error::verify_good(status_code) {
             log::warn!("Error in response when deleting subscriptions: {error}");
         }
     }
@@ -365,7 +365,7 @@ fn delete_subscriptions(client: &ua::Client, request: &ua::DeleteSubscriptionsRe
             )
         }
     });
-    if let Err(error) = Error::verify_good(&status_code) {
+    if let Err(error) = Error::verify_good(status_code) {
         log::warn!("Error in request when deleting subscriptions: {error}");
     }
 }

src/client.rs

@@ -291,7 +291,7 @@ impl ClientBuilder {
             );
             result
         });
-        Error::verify_good(&status_code)?;
+        Error::verify_good(status_code)?;
 
         let Some(endpoint_descriptions) = endpoint_descriptions else {
             return Err(Error::internal("expected array of endpoint descriptions"));
@@ -400,7 +400,7 @@ impl Client {
             // SAFETY: The method does not take ownership of `client`.
             UA_Client_connect(self.0.as_mut_ptr(), endpoint_url.as_ptr())
         });
-        Error::verify_good(&status_code)
+        Error::verify_good(status_code)
     }
 
     /// Disconnects from endpoint.