fix clippy

Author: SteveL-MSFT

dsc_lib/src/dscresources/dscresource.rs

@@ -187,7 +187,7 @@ impl DscResource {
             after_state: after_state.clone(),
             changed_properties: if diff.is_empty() { None } else { Some(diff) },
         });
-        return Ok(set_result);
+        Ok(set_result)
     }
 
     fn invoke_test_with_adapter(&self, adapter: &str, resource_name: &str, expected: &str) -> Result<TestResult, DscError> {
@@ -221,7 +221,7 @@ impl DscResource {
             in_desired_state: resource_result.in_desired_state,
             diff_properties,
         });
-        return Ok(test_result);
+        Ok(test_result)
     }
 
     fn invoke_delete_with_adapter(&self, adapter: &str, resource_name: &str, filter: &str) -> Result<(), DscError> {
@@ -236,7 +236,7 @@ impl DscResource {
         }
 
         configurator.invoke_set(false)?;
-        return Ok(());
+        Ok(())
     }
 
     fn invoke_export_with_adapter(&self, adapter: &str, input: &str) -> Result<ExportResult, DscError> {
@@ -266,7 +266,7 @@ impl DscResource {
                 export_result.actual_state.push(serde_json::to_value(result.clone())?);
             }
         }
-        return Ok(export_result);
+        Ok(export_result)
     }
 
     fn get_adapter_resource(configurator: &mut Configurator, adapter: &str) -> Result<DscResource, DscError> {
@@ -620,6 +620,19 @@ pub fn redact(value: &Value) -> Value {
 ///
 /// # Errors
 /// * `DscError` - The adapter manifest is not found or invalid
+/// Retrieve the kind of adapter
+///
+/// # Arguments
+///
+/// * `adapter` - The adapter resource
+///
+/// # Returns
+///
+/// The input kind of the adapter
+///
+/// # Errors
+///
+/// * `DscError` - The adapter does not have a manifest or the manifest is invalid
 pub fn get_adapter_input_kind(adapter: &DscResource) -> Result<AdapterInputKind, DscError> {
         if let Some(manifest) = &adapter.manifest {
             if let Ok(manifest) = serde_json::from_value::<ResourceManifest>(manifest.clone()) {

tools/dsctest/src/adapter.rs

@@ -49,7 +49,14 @@ pub struct DscResource {
 }
 
 pub fn adapt(resource_type: &str, input: &str, operation: &AdapterOperation) -> Result<String, String> {
+<<<<<<< HEAD
     match operation {
+||||||| parent of c22f78ea (fix clippy)
+pub fn adapt(resource_type: &str, input: &str, operation: AdapterOperation) -> Result<String, String> {
+    match operation {
+=======
+    match *operation {
+>>>>>>> c22f78ea (fix clippy)
         AdapterOperation::List => {
             let resource_one = DscResource {
                 type_name: "Adapted/One".to_string(),
@@ -93,7 +100,7 @@ pub fn adapt(resource_type: &str, input: &str, operation: &AdapterOperation) ->
                     };
                     Ok(serde_json::to_string(&adapted_two).unwrap())
                 },
-                _ => Err(format!("Unknown resource type: {}", resource_type)),
+                _ => Err(format!("Unknown resource type: {resource_type}")),
             }
         },
         AdapterOperation::Set | AdapterOperation::Test => {
@@ -139,7 +146,7 @@ pub fn adapt(resource_type: &str, input: &str, operation: &AdapterOperation) ->
                     println!("{}", serde_json::to_string(&adapted_two).unwrap());
                     std::process::exit(0);
                 },
-                _ => Err(format!("Unknown resource type: {}", resource_type)),
+                _ => Err(format!("Unknown resource type: {resource_type}")),
             }
         },
         AdapterOperation::Validate => {