@@ -15,6 +15,7 @@ use crate::{iter, property::*, Error, Result};
15
15
/// The vCard type.
16
16
#[ derive( Debug , Default , Eq , PartialEq , Clone ) ]
17
17
#[ cfg_attr( feature = "serde" , derive( Serialize , Deserialize ) ) ]
18
+ #[ cfg_attr( feature = "serde" , serde( rename_all = "camelCase" ) ) ]
18
19
#[ cfg_attr( feature = "zeroize" , derive( Zeroize , ZeroizeOnDrop ) ) ]
19
20
pub struct Vcard {
20
21
// General
@@ -341,7 +342,7 @@ impl fmt::Display for Vcard {
341
342
for val in & self . source {
342
343
write ! ( f, "{}\r \n " , content_line( val, SOURCE ) ) ?;
343
344
}
344
- for val in & self . kind {
345
+ if let Some ( val) = & self . kind {
345
346
write ! ( f, "{}\r \n " , content_line( val, KIND ) ) ?;
346
347
}
347
348
for val in & self . xml {
@@ -352,7 +353,7 @@ impl fmt::Display for Vcard {
352
353
for val in & self . formatted_name {
353
354
write ! ( f, "{}\r \n " , content_line( val, FN ) ) ?;
354
355
}
355
- for val in & self . name {
356
+ if let Some ( val) = & self . name {
356
357
write ! ( f, "{}\r \n " , content_line( val, N ) ) ?;
357
358
}
358
359
for val in & self . nickname {
@@ -361,13 +362,13 @@ impl fmt::Display for Vcard {
361
362
for val in & self . photo {
362
363
write ! ( f, "{}\r \n " , content_line( val, PHOTO ) ) ?;
363
364
}
364
- for val in & self . bday {
365
+ if let Some ( val) = & self . bday {
365
366
write ! ( f, "{}\r \n " , content_line( val, BDAY ) ) ?;
366
367
}
367
- for val in & self . anniversary {
368
+ if let Some ( val) = & self . anniversary {
368
369
write ! ( f, "{}\r \n " , content_line( val, ANNIVERSARY ) ) ?;
369
370
}
370
- for val in & self . gender {
371
+ if let Some ( val) = & self . gender {
371
372
write ! ( f, "{}\r \n " , content_line( val, GENDER ) ) ?;
372
373
}
373
374
for val in & self . url {
@@ -428,16 +429,16 @@ impl fmt::Display for Vcard {
428
429
for val in & self . note {
429
430
write ! ( f, "{}\r \n " , content_line( val, NOTE ) ) ?;
430
431
}
431
- for val in & self . prod_id {
432
+ if let Some ( val) = & self . prod_id {
432
433
write ! ( f, "{}\r \n " , content_line( val, PRODID ) ) ?;
433
434
}
434
- for val in & self . rev {
435
+ if let Some ( val) = & self . rev {
435
436
write ! ( f, "{}\r \n " , content_line( val, REV ) ) ?;
436
437
}
437
438
for val in & self . sound {
438
439
write ! ( f, "{}\r \n " , content_line( val, SOUND ) ) ?;
439
440
}
440
- for val in & self . uid {
441
+ if let Some ( val) = & self . uid {
441
442
write ! ( f, "{}\r \n " , content_line( val, UID ) ) ?;
442
443
}
443
444
for val in & self . client_pid_map {
0 commit comments