@@ -70,11 +70,8 @@ const FULLNAME_ATYPE_SUFFIX: &str = ".gemeente.personalData.fullname";
7070/// follow-up). Each entry's `.firstName` / `.lastName` pair, when both
7171/// are present and non-empty, is concatenated into a single display name.
7272/// Suffix-matching catches both `pbdf.pbdf.*` and `irma-demo.pbdf.*`.
73- const NAME_PAIR_CREDENTIAL_SUFFIXES : & [ & str ] = & [
74- ".pbdf.passport" ,
75- ".pbdf.idcard" ,
76- ".pbdf.drivinglicence" ,
77- ] ;
73+ const NAME_PAIR_CREDENTIAL_SUFFIXES : & [ & str ] =
74+ & [ ".pbdf.passport" , ".pbdf.idcard" , ".pbdf.drivinglicence" ] ;
7875
7976fn is_fullname_atype ( atype : & str ) -> bool {
8077 atype. ends_with ( FULLNAME_ATYPE_SUFFIX )
@@ -592,11 +589,11 @@ mod tests {
592589 #[ test]
593590 fn sender_display_concatenates_firstname_lastname_from_passport ( ) {
594591 let state = filestate_with_attrs ( vec ! [
592+ ( "pbdf.pbdf.passport.firstName" . to_owned( ) , "Jan" . to_owned( ) ) ,
595593 (
596- "pbdf.pbdf.passport.firstName " . to_owned( ) ,
597- "Jan " . to_owned( ) ,
594+ "pbdf.pbdf.passport.lastName " . to_owned( ) ,
595+ "Jansen " . to_owned( ) ,
598596 ) ,
599- ( "pbdf.pbdf.passport.lastName" . to_owned( ) , "Jansen" . to_owned( ) ) ,
600597 ( "orgName" . to_owned( ) , "Acme" . to_owned( ) ) ,
601598 ] ) ;
602599 let ( display, remaining) = sender_display ( & state) ;
@@ -660,10 +657,7 @@ mod tests {
660657 "pbdf.gemeente.personalData.fullname" . to_owned( ) ,
661658 "Marie Smit" . to_owned( ) ,
662659 ) ,
663- (
664- "pbdf.pbdf.passport.firstName" . to_owned( ) ,
665- "Jan" . to_owned( ) ,
666- ) ,
660+ ( "pbdf.pbdf.passport.firstName" . to_owned( ) , "Jan" . to_owned( ) ) ,
667661 (
668662 "pbdf.pbdf.passport.lastName" . to_owned( ) ,
669663 "Jansen" . to_owned( ) ,
@@ -686,20 +680,14 @@ mod tests {
686680 assert_eq ! ( display, "PostGuard" ) ;
687681 assert_eq ! (
688682 remaining,
689- vec![ (
690- "pbdf.pbdf.passport.firstName" . to_owned( ) ,
691- "Jan" . to_owned( )
692- ) ]
683+ vec![ ( "pbdf.pbdf.passport.firstName" . to_owned( ) , "Jan" . to_owned( ) ) ]
693684 ) ;
694685 }
695686
696687 #[ test]
697688 fn sender_display_treats_empty_firstname_lastname_as_not_disclosed ( ) {
698689 let state = filestate_with_attrs ( vec ! [
699- (
700- "pbdf.pbdf.passport.firstName" . to_owned( ) ,
701- String :: new( ) ,
702- ) ,
690+ ( "pbdf.pbdf.passport.firstName" . to_owned( ) , String :: new( ) ) ,
703691 (
704692 "pbdf.pbdf.passport.lastName" . to_owned( ) ,
705693 "Jansen" . to_owned( ) ,
0 commit comments