Skip to content

Commit f8a4eb1

Browse files
author
Steve Lee (POWERSHELL HE/HIM) (from Dev Box)
committed
fix clippy
1 parent 2071b20 commit f8a4eb1

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

dsc_lib/src/discovery/command_discovery.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ impl ResourceDiscovery for CommandDiscovery {
148148
let manifest = import_manifest(manifest.clone())?;
149149
if manifest.kind == Some(Kind::Adapter) {
150150
trace!("Resource adapter {} found", resource.type_name);
151-
insert_resource(&mut adapters, &resource)?;
151+
insert_resource(&mut adapters, &resource);
152152
} else {
153153
trace!("Resource {} found", resource.type_name);
154-
insert_resource(&mut resources, &resource)?;
154+
insert_resource(&mut resources, &resource);
155155
}
156156
}
157157
}
@@ -253,7 +253,7 @@ impl ResourceDiscovery for CommandDiscovery {
253253
}
254254

255255
if name_regex.is_match(&resource.type_name) {
256-
insert_resource(&mut adapted_resources, &resource)?;
256+
insert_resource(&mut adapted_resources, &resource);
257257
adapter_resources_count += 1;
258258
}
259259
},
@@ -340,11 +340,11 @@ impl ResourceDiscovery for CommandDiscovery {
340340
}
341341

342342
// helper to insert a resource into a vector of resources in order of newest to oldest
343-
fn insert_resource(resources: &mut BTreeMap<String, Vec<DscResource>>, resource: &DscResource) -> Result<(), DscError> {
343+
fn insert_resource(resources: &mut BTreeMap<String, Vec<DscResource>>, resource: &DscResource) {
344344
if resources.contains_key(&resource.type_name) {
345345
let Some(resource_versions) = resources.get_mut(&resource.type_name) else {
346346
resources.insert(resource.type_name.clone(), vec![resource.clone()]);
347-
return Ok(());
347+
return;
348348
};
349349
// compare the resource versions and insert newest to oldest using semver
350350
let mut insert_index = resource_versions.len();
@@ -367,7 +367,7 @@ fn insert_resource(resources: &mut BTreeMap<String, Vec<DscResource>>, resource:
367367
};
368368
// if the version already exists, we skip
369369
if resource_instance_version == resource_version {
370-
return Ok(());
370+
return;
371371
}
372372

373373
if resource_instance_version < resource_version {
@@ -379,7 +379,6 @@ fn insert_resource(resources: &mut BTreeMap<String, Vec<DscResource>>, resource:
379379
} else {
380380
resources.insert(resource.type_name.clone(), vec![resource.clone()]);
381381
}
382-
Ok(())
383382
}
384383

385384
fn load_manifest(path: &Path) -> Result<DscResource, DscError> {

0 commit comments

Comments
 (0)