@@ -155,15 +155,15 @@ impl MapperEntry {
155
155
156
156
//dto property is required and must be checked
157
157
match dto_prop {
158
- Some ( val) if utils :: isblank ( & val) => Err ( syn:: Error :: new (
158
+ Some ( val) if isblank ( & val) => Err ( syn:: Error :: new (
159
159
attr. span ( ) ,
160
160
"`dto` property is blank. It must not have whitespace" ,
161
161
) ) ,
162
162
None => Err ( syn:: Error :: new (
163
163
attr. span ( ) ,
164
164
"`dto` property is missing.It is required for mapper" ,
165
165
) ) ,
166
- _ => syn :: Result :: Ok ( mapper_entry) ,
166
+ _ => Ok ( mapper_entry) ,
167
167
}
168
168
}
169
169
@@ -217,12 +217,7 @@ impl MapperEntry {
217
217
let ignore_arr = Self :: parse_array_of_string ( expr_arr) ;
218
218
//println!("{}={:?}",keyname, ignore_arr);
219
219
//check if matt attribute is blank
220
- if ignore_arr
221
- . iter ( )
222
- . filter ( |& text| utils:: isblank ( text) )
223
- . count ( )
224
- > 0
225
- {
220
+ if ignore_arr. iter ( ) . filter ( |& text| isblank ( text) ) . count ( ) > 0 {
226
221
panic ! ( "`{}` attribute must not be blank" , IGNORE ) ;
227
222
} ;
228
223
mapper_entry. ignore = ignore_arr;
@@ -262,22 +257,22 @@ impl MapperEntry {
262
257
if mapper_entry
263
258
. map
264
259
. iter ( )
265
- . filter ( |& m_val| utils :: isblank ( & m_val. from_field ) )
260
+ . filter ( |& m_val| isblank ( & m_val. from_field ) )
266
261
. count ( )
267
262
> 0
268
263
{
269
264
panic ! ( "`{}` attribute must not be blank" , MAP ) ;
270
265
} ;
271
266
}
272
267
273
- fn parse_array_of_macro_attr ( expr_arr : & syn :: ExprArray ) -> Vec < String > {
268
+ fn parse_array_of_macro_attr ( expr_arr : & ExprArray ) -> Vec < String > {
274
269
let mut vec_tuple: Vec < String > = Vec :: new ( ) ;
275
270
276
271
for elem in expr_arr. elems . iter ( ) {
277
272
Self :: process_macro_attr ( & mut vec_tuple, elem) ;
278
273
}
279
274
280
- return vec_tuple;
275
+ vec_tuple
281
276
}
282
277
fn process_macro_attr ( vec_array : & mut Vec < String > , elem : & Expr ) {
283
278
if let Expr :: Lit ( content_lit) = elem {
@@ -291,7 +286,7 @@ impl MapperEntry {
291
286
// eprintln!("elem={:#?}", elem);
292
287
}
293
288
294
- fn parse_array_of_tuple ( expr_arr : & syn :: ExprArray ) -> Vec < MapTuple > {
289
+ fn parse_array_of_tuple ( expr_arr : & ExprArray ) -> Vec < MapTuple > {
295
290
let mut vec_tuple: Vec < ( String , bool ) > = Vec :: new ( ) ;
296
291
297
292
for elem in expr_arr. elems . iter ( ) {
@@ -321,17 +316,17 @@ impl MapperEntry {
321
316
}
322
317
}
323
318
324
- return vec_tuple;
319
+ vec_tuple
325
320
}
326
321
327
- fn parse_array_of_new_fields ( expr_arr : & syn :: ExprArray ) -> Vec < NewField > {
322
+ fn parse_array_of_new_fields ( expr_arr : & ExprArray ) -> Vec < NewField > {
328
323
let mut vec_tuple: Vec < NewField > = Vec :: new ( ) ;
329
324
330
325
for elem in expr_arr. elems . iter ( ) {
331
326
Self :: process_new_fields ( & mut vec_tuple, elem) ;
332
327
}
333
328
334
- return vec_tuple;
329
+ vec_tuple
335
330
}
336
331
337
332
fn process_new_fields ( mut vec_tuple : & mut Vec < NewField > , elem : & Expr ) {
@@ -428,7 +423,7 @@ impl MapperEntry {
428
423
) ) ;
429
424
}
430
425
431
- fn parse_array_of_string ( expr_arr : & syn :: ExprArray ) -> Vec < String > {
426
+ fn parse_array_of_string ( expr_arr : & ExprArray ) -> Vec < String > {
432
427
let mut vec_str: Vec < String > = Vec :: new ( ) ;
433
428
for elem in expr_arr. elems . iter ( ) {
434
429
if let Expr :: Lit ( lit_expr) = elem {
@@ -439,7 +434,7 @@ impl MapperEntry {
439
434
}
440
435
}
441
436
}
442
- return vec_str;
437
+ vec_str
443
438
}
444
439
}
445
440
0 commit comments