@@ -217,7 +217,7 @@ pub fn fields(
217217 // TODO(AJM) - do we need to do anything with this range type?
218218 let BitRange { offset, width, .. } = f. bit_range ;
219219 let name = util:: replace_suffix ( & f. name , "" ) ;
220- let sc = Ident :: new ( & name. to_sanitized_snake_case ( ) , span) ;
220+ let name_sc = Ident :: new ( & name. to_sanitized_snake_case ( ) , span) ;
221221 let name_pc = name. to_sanitized_upper_case ( ) ;
222222 let bits = Ident :: new ( if width == 1 { "bit" } else { "bits" } , span) ;
223223 let description = if let Some ( d) = & f. description {
@@ -323,7 +323,7 @@ pub fn fields(
323323 r_impl_items. extend ( quote ! {
324324 #[ doc = #doc]
325325 #inline
326- pub unsafe fn #sc ( & self , n: usize ) -> #name_pc_r {
326+ pub unsafe fn #name_sc ( & self , n: usize ) -> #name_pc_r {
327327 #name_pc_r:: new ( #value )
328328 }
329329 } ) ;
@@ -339,7 +339,7 @@ pub fn fields(
339339 ( self . bits & #hexmask) #cast
340340 }
341341 } ;
342- let sc_n = Ident :: new (
342+ let name_sc_n = Ident :: new (
343343 & util:: replace_suffix ( & f. name . to_sanitized_snake_case ( ) , & suffix) ,
344344 Span :: call_site ( ) ,
345345 ) ;
@@ -350,7 +350,7 @@ pub fn fields(
350350 r_impl_items. extend ( quote ! {
351351 #[ doc = #doc]
352352 #inline
353- pub fn #sc_n ( & self ) -> #name_pc_r {
353+ pub fn #name_sc_n ( & self ) -> #name_pc_r {
354354 #name_pc_r:: new ( #value )
355355 }
356356 } ) ;
@@ -360,7 +360,7 @@ pub fn fields(
360360 r_impl_items. extend ( quote ! {
361361 #[ doc = #doc]
362362 #inline
363- pub fn #sc ( & self ) -> #name_pc_r {
363+ pub fn #name_sc ( & self ) -> #name_pc_r {
364364 #name_pc_r:: new ( #value )
365365 }
366366 } ) ;
@@ -611,13 +611,13 @@ pub fn fields(
611611 w_impl_items. extend ( quote ! {
612612 #[ doc = #doc]
613613 #inline
614- pub unsafe fn #sc ( & mut self , n: usize ) -> #name_pc_w {
614+ pub unsafe fn #name_sc ( & mut self , n: usize ) -> #name_pc_w {
615615 #name_pc_w { w: self , offset: #offset_calc }
616616 }
617617 } ) ;
618618 for ( i, suffix) in ( 0 ..* dim) . zip ( suffixes. iter ( ) ) {
619619 let sub_offset = offset + ( i as u64 ) * ( * increment as u64 ) ;
620- let sc_n = Ident :: new (
620+ let name_sc_n = Ident :: new (
621621 & util:: replace_suffix ( & f. name . to_sanitized_snake_case ( ) , & suffix) ,
622622 Span :: call_site ( ) ,
623623 ) ;
@@ -629,7 +629,7 @@ pub fn fields(
629629 w_impl_items. extend ( quote ! {
630630 #[ doc = #doc]
631631 #inline
632- pub fn #sc_n ( & mut self ) -> #name_pc_w {
632+ pub fn #name_sc_n ( & mut self ) -> #name_pc_w {
633633 #name_pc_w { w: self , offset: #sub_offset }
634634 }
635635 } ) ;
@@ -639,7 +639,7 @@ pub fn fields(
639639 w_impl_items. extend ( quote ! {
640640 #[ doc = #doc]
641641 #inline
642- pub fn #sc ( & mut self ) -> #name_pc_w {
642+ pub fn #name_sc ( & mut self ) -> #name_pc_w {
643643 #name_pc_w { w: self }
644644 }
645645 } ) ;
0 commit comments