@@ -148,10 +148,10 @@ impl ResourceDiscovery for CommandDiscovery {
148
148
let manifest = import_manifest ( manifest. clone ( ) ) ?;
149
149
if manifest. kind == Some ( Kind :: Adapter ) {
150
150
trace ! ( "Resource adapter {} found" , resource. type_name) ;
151
- insert_resource ( & mut adapters, & resource) ? ;
151
+ insert_resource ( & mut adapters, & resource) ;
152
152
} else {
153
153
trace ! ( "Resource {} found" , resource. type_name) ;
154
- insert_resource ( & mut resources, & resource) ? ;
154
+ insert_resource ( & mut resources, & resource) ;
155
155
}
156
156
}
157
157
}
@@ -253,7 +253,7 @@ impl ResourceDiscovery for CommandDiscovery {
253
253
}
254
254
255
255
if name_regex. is_match ( & resource. type_name ) {
256
- insert_resource ( & mut adapted_resources, & resource) ? ;
256
+ insert_resource ( & mut adapted_resources, & resource) ;
257
257
adapter_resources_count += 1 ;
258
258
}
259
259
} ,
@@ -340,11 +340,11 @@ impl ResourceDiscovery for CommandDiscovery {
340
340
}
341
341
342
342
// 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 ) {
344
344
if resources. contains_key ( & resource. type_name ) {
345
345
let Some ( resource_versions) = resources. get_mut ( & resource. type_name ) else {
346
346
resources. insert ( resource. type_name . clone ( ) , vec ! [ resource. clone( ) ] ) ;
347
- return Ok ( ( ) ) ;
347
+ return ;
348
348
} ;
349
349
// compare the resource versions and insert newest to oldest using semver
350
350
let mut insert_index = resource_versions. len ( ) ;
@@ -367,7 +367,7 @@ fn insert_resource(resources: &mut BTreeMap<String, Vec<DscResource>>, resource:
367
367
} ;
368
368
// if the version already exists, we skip
369
369
if resource_instance_version == resource_version {
370
- return Ok ( ( ) ) ;
370
+ return ;
371
371
}
372
372
373
373
if resource_instance_version < resource_version {
@@ -379,7 +379,6 @@ fn insert_resource(resources: &mut BTreeMap<String, Vec<DscResource>>, resource:
379
379
} else {
380
380
resources. insert ( resource. type_name . clone ( ) , vec ! [ resource. clone( ) ] ) ;
381
381
}
382
- Ok ( ( ) )
383
382
}
384
383
385
384
fn load_manifest ( path : & Path ) -> Result < DscResource , DscError > {
0 commit comments