@@ -653,7 +653,7 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
653653
654654 match cluster {
655655 Cluster :: Single ( info) => cluster_expanded. push ( RegisterBlockField {
656- syn_field : convert_svd_cluster ( cluster) ?,
656+ syn_field : cluster_to_syn_field ( cluster) ?,
657657 description : info. description . as_ref ( ) . unwrap_or ( & info. name ) . into ( ) ,
658658 offset : info. address_offset ,
659659 size : cluster_size,
@@ -682,7 +682,7 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
682682 if array_convertible {
683683 if sequential_indexes_from0 {
684684 cluster_expanded. push ( RegisterBlockField {
685- syn_field : convert_svd_cluster ( cluster) ?,
685+ syn_field : cluster_to_syn_field ( cluster) ?,
686686 description : info. description . as_ref ( ) . unwrap_or ( & info. name ) . into ( ) ,
687687 offset : info. address_offset ,
688688 size : cluster_size * array_info. dim ,
@@ -713,7 +713,7 @@ fn expand_cluster(cluster: &Cluster, config: &Config) -> Result<Vec<RegisterBloc
713713 } ) ;
714714 }
715715 cluster_expanded. push ( RegisterBlockField {
716- syn_field : convert_svd_cluster ( cluster) ?,
716+ syn_field : cluster_to_syn_field ( cluster) ?,
717717 description : description. into ( ) ,
718718 offset : info. address_offset ,
719719 size : cluster_size * array_info. dim ,
@@ -753,7 +753,7 @@ fn expand_register(register: &Register, config: &Config) -> Result<Vec<RegisterB
753753
754754 match register {
755755 Register :: Single ( info) => register_expanded. push ( RegisterBlockField {
756- syn_field : convert_svd_register ( register, config. ignore_groups )
756+ syn_field : register_to_syn_field ( register, config. ignore_groups )
757757 . with_context ( || "syn error occured" ) ?,
758758 description : info. description . clone ( ) . unwrap_or_default ( ) ,
759759 offset : info. address_offset ,
@@ -783,7 +783,7 @@ fn expand_register(register: &Register, config: &Config) -> Result<Vec<RegisterB
783783
784784 if sequential_indexes_from0 {
785785 register_expanded. push ( RegisterBlockField {
786- syn_field : convert_svd_register ( register, config. ignore_groups ) ?,
786+ syn_field : register_to_syn_field ( register, config. ignore_groups ) ?,
787787 description : info. description . clone ( ) . unwrap_or_default ( ) ,
788788 offset : info. address_offset ,
789789 size : register_size * array_info. dim ,
@@ -815,7 +815,7 @@ fn expand_register(register: &Register, config: &Config) -> Result<Vec<RegisterB
815815 } ) ;
816816 }
817817 register_expanded. push ( RegisterBlockField {
818- syn_field : convert_svd_register ( register, config. ignore_groups ) ?,
818+ syn_field : register_to_syn_field ( register, config. ignore_groups ) ?,
819819 description,
820820 offset : info. address_offset ,
821821 size : register_size * array_info. dim ,
@@ -941,12 +941,12 @@ fn expand_svd_register(register: &Register, ignore_group: bool) -> Result<Vec<sy
941941 }
942942 Ok ( out)
943943 } else {
944- Ok ( vec ! [ convert_svd_register ( register, ignore_group) ?] )
944+ Ok ( vec ! [ register_to_syn_field ( register, ignore_group) ?] )
945945 }
946946}
947947
948948/// Convert a parsed `Register` into its `Field` equivalent
949- fn convert_svd_register ( register : & Register , ignore_group : bool ) -> Result < syn:: Field > {
949+ fn register_to_syn_field ( register : & Register , ignore_group : bool ) -> Result < syn:: Field > {
950950 Ok ( match register {
951951 Register :: Single ( info) => {
952952 let info_name = info. fullname ( ignore_group) ;
@@ -1011,12 +1011,12 @@ fn expand_svd_cluster(cluster: &Cluster) -> Result<Vec<syn::Field>, syn::Error>
10111011 }
10121012 Ok ( out)
10131013 } else {
1014- Ok ( vec ! [ convert_svd_cluster ( cluster) ?] )
1014+ Ok ( vec ! [ cluster_to_syn_field ( cluster) ?] )
10151015 }
10161016}
10171017
10181018/// Convert a parsed `Cluster` into its `Field` equivalent
1019- fn convert_svd_cluster ( cluster : & Cluster ) -> Result < syn:: Field , syn:: Error > {
1019+ fn cluster_to_syn_field ( cluster : & Cluster ) -> Result < syn:: Field , syn:: Error > {
10201020 Ok ( match cluster {
10211021 Cluster :: Single ( info) => {
10221022 let ty_name = util:: replace_suffix ( & info. name , "" ) ;
0 commit comments