@@ -374,37 +374,36 @@ where
374
374
375
375
// for each role group ...
376
376
for ( role_group_name, role_group) in & role. role_groups {
377
- let mut rg_properties_merged = role_properties. clone ( ) ;
377
+ let mut role_group_properties_merged = role_properties. clone ( ) ;
378
378
379
379
// ... compute the group properties and merge them into role properties.
380
380
let role_group_properties =
381
381
parse_role_config ( resource, role_name, & role_group. config , property_kinds) ?;
382
382
for ( property_kind, properties) in role_group_properties {
383
- rg_properties_merged
383
+ role_group_properties_merged
384
384
. entry ( property_kind)
385
385
. or_default ( )
386
386
. extend ( properties) ;
387
387
}
388
388
389
- // ... copy role overrides and merge them into `rg_properties_merged`.
390
- let role_overrides_copy = role_overrides. clone ( ) ;
391
- for ( property_kind, property_overrides) in role_overrides_copy {
392
- rg_properties_merged
389
+ // ... copy role overrides and merge them into `role_group_properties_merged`.
390
+ for ( property_kind, property_overrides) in role_overrides. clone ( ) {
391
+ role_group_properties_merged
393
392
. entry ( property_kind)
394
393
. or_default ( )
395
394
. extend ( property_overrides) ;
396
395
}
397
396
398
- // ... compute the role group overrides and merge them into `rg_properties_merged `.
397
+ // ... compute the role group overrides and merge them into `role_group_properties_merged `.
399
398
let role_group_overrides = parse_role_overrides ( & role_group. config , property_kinds) ?;
400
399
for ( property_kind, property_overrides) in role_group_overrides {
401
- rg_properties_merged
400
+ role_group_properties_merged
402
401
. entry ( property_kind)
403
402
. or_default ( )
404
403
. extend ( property_overrides) ;
405
404
}
406
405
407
- result. insert ( role_group_name. clone ( ) , rg_properties_merged ) ;
406
+ result. insert ( role_group_name. clone ( ) , role_group_properties_merged ) ;
408
407
}
409
408
410
409
Ok ( result)
0 commit comments