@@ -249,30 +249,17 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
249249 exprs. extend ( quote ! ( #id: #id { _marker: PhantomData } , ) ) ;
250250 }
251251 Peripheral :: Array ( _p, dim_element) => {
252- if config. const_generic {
253- let p_name = util:: name_of ( p, config. ignore_groups ) ;
254- let p = p_name. to_sanitized_upper_case ( ) ;
255- let id = Ident :: new ( & p, Span :: call_site ( ) ) ;
256- let dim = dim_element. dim as usize ;
257- let dim_increment = util:: hex ( dim_element. dim_increment as u64 ) ;
258- fields. extend ( quote ! {
252+ let p_names: Vec < Cow < str > > = names ( p, dim_element) . map ( |n| n. into ( ) ) . collect ( ) ;
253+ let p = p_names. iter ( ) . map ( |p| p. to_sanitized_upper_case ( ) ) ;
254+ let ids_f = p. clone ( ) . map ( |p| Ident :: new ( & p, Span :: call_site ( ) ) ) ;
255+ let ids_e = ids_f. clone ( ) ;
256+ fields. extend ( quote ! {
257+ #(
259258 #[ doc = #p]
260- pub #id: crate :: ArrayProxy <#id, #dim, #dim_increment>,
261- } ) ;
262- exprs. extend ( quote ! ( #id: crate :: ArrayProxy :: new( ) , ) ) ;
263- } else {
264- let p_names: Vec < Cow < str > > = names ( p, dim_element) . map ( |n| n. into ( ) ) . collect ( ) ;
265- let p = p_names. iter ( ) . map ( |p| p. to_sanitized_upper_case ( ) ) ;
266- let ids_f = p. clone ( ) . map ( |p| Ident :: new ( & p, Span :: call_site ( ) ) ) ;
267- let ids_e = ids_f. clone ( ) ;
268- fields. extend ( quote ! {
269- #(
270- #[ doc = #p]
271- pub #ids_f: #ids_f,
272- ) *
273- } ) ;
274- exprs. extend ( quote ! ( #( #ids_e: #ids_e { _marker: PhantomData } , ) * ) ) ;
275- }
259+ pub #ids_f: #ids_f,
260+ ) *
261+ } ) ;
262+ exprs. extend ( quote ! ( #( #ids_e: #ids_e { _marker: PhantomData } , ) * ) ) ;
276263 }
277264 }
278265 }
0 commit comments