File tree Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Expand file tree Collapse file tree 2 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -898,14 +898,13 @@ impl Configurator {
898
898
return Err ( DscError :: Validation ( t ! ( "configure.mod.copyBatchSizeNotSupported" ) . to_string ( ) ) ) ;
899
899
}
900
900
self . context . process_mode = ProcessMode :: Copy ;
901
- self . context . copy_current_loop_name = copy. name . clone ( ) ;
901
+ self . context . copy_current_loop_name . clone_from ( & copy. name ) ;
902
902
let mut copy_resources = Vec :: < Resource > :: new ( ) ;
903
903
for i in 0 ..copy. count {
904
904
self . context . copy . insert ( copy. name . clone ( ) , i) ;
905
905
let mut new_resource = resource. clone ( ) ;
906
- let new_name = match self . statement_parser . parse_and_execute ( & resource. name , & self . context ) ? {
907
- Value :: String ( s) => s,
908
- _ => return Err ( DscError :: Parser ( t ! ( "configure.mod.copyNameResultNotString" , name = & copy. name) . to_string ( ) ) ) ,
906
+ let Value :: String ( new_name) = self . statement_parser . parse_and_execute ( & resource. name , & self . context ) ? else {
907
+ return Err ( DscError :: Parser ( t ! ( "configure.mod.copyNameResultNotString" , name = & copy. name) . to_string ( ) ) )
909
908
} ;
910
909
new_resource. name = new_name. to_string ( ) ;
911
910
new_resource. copy = None ;
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ impl Function for CopyIndex {
61
61
if let Some ( loop_name) = args[ 0 ] . as_str ( ) {
62
62
if let Some ( index) = context. copy . get ( loop_name) {
63
63
if let Some ( offset) = args[ 1 ] . as_i64 ( ) {
64
- Ok ( Value :: Number ( ( ( * index as i64 ) + offset) . into ( ) ) )
64
+ Ok ( Value :: Number ( ( ( * index) + offset) . into ( ) ) )
65
65
} else {
66
66
Err ( DscError :: Parser ( t ! ( "functions.invalidArguments" ) . to_string ( ) ) )
67
67
}
You can’t perform that action at this time.
0 commit comments