const-generic feature

Author: burrbull

.github/bors.toml

@@ -15,7 +15,7 @@ status = [
   "ci-linux (stable, Spansion, x86_64-unknown-linux-gnu, linux)",
   "ci-linux (stable, STMicro, x86_64-unknown-linux-gnu, linux)",
   "ci-linux (stable, Toshiba, x86_64-unknown-linux-gnu, linux)",
-  "ci-linux (1.51.0, Nordic, x86_64-unknown-linux-gnu, linux)",
+  "ci-linux (1.40.0, Nordic, x86_64-unknown-linux-gnu, linux)",
   "ci-linux (stable, x86_64-apple-darwin, osx)",
   "ci-linux (stable, x86_64-pc-windows-msvc, windows)",
 ]

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
 
         include:
           # Test MSRV
-          - rust: 1.51.0
+          - rust: 1.40.0
             VENDOR: Nordic
             TARGET: x86_64-unknown-linux-gnu
             TRAVIS_OS_NAME: linux

CHANGELOG.md

@@ -30,7 +30,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
-- [breaking-change] support for "field arrays"
+- [breaking-change] support for "field arrays".
+  With feature "const-generic" it also generates const generic variant of
+  field arrat structure (requires rust 1.51) 
 
 - [breaking-change] remove `Variant<U, ENUM_A>`, use `Option<ENUM_A>` instead
 

Cargo.toml

@@ -52,3 +52,4 @@ features = ["full","extra-traits"]
 
 [features]
 strict = ["svd-parser/strict"]
+const-generic = []

src/generate/register.rs

@@ -563,6 +563,7 @@ pub fn fields(
         if can_write {
             let new_pc_aw = Ident::new(&(name_pc.clone() + "_AW"), span);
             let name_pc_w = Ident::new(&(name_pc.clone() + "_W"), span);
+            #[cfg(feature = "const-generic")]
             let name_pc_cgw = Ident::new(&(name_pc.clone() + "_CGW"), span);
 
             let mut proxy_items = TokenStream::new();
@@ -641,6 +642,7 @@ pub fn fields(
             }
 
             let mut proxy_items_fa = TokenStream::new();
+            #[cfg(feature = "const-generic")]
             let mut proxy_items_cg = TokenStream::new();
             if field_dim.is_some() {
                 proxy_items_fa.extend(quote! {
@@ -651,6 +653,7 @@ pub fn fields(
                         self.w
                     }
                 });
+                #[cfg(feature="const-generic")]
                 proxy_items_cg.extend(quote! {
                     ///Writes raw bits to the field
                     #inline
@@ -682,13 +685,17 @@ pub fn fields(
                 });
             }
 
+            #[cfg(feature = "const-generic")]
             let mut cgdoc = String::new();
             let doc = if let Some((_, _, _, _, suffixes_str)) = &field_dim {
-                cgdoc = format!(
-                    "Fields `{}` const generic writer - {}",
-                    util::replace_suffix(&f.name, suffixes_str),
-                    description
-                );
+                #[cfg(feature = "const-generic")]
+                {
+                    cgdoc = format!(
+                        "Fields `{}` const generic writer - {}",
+                        util::replace_suffix(&f.name, suffixes_str),
+                        description
+                    );
+                }
                 format!(
                     "Fields `{}` writer - {}",
                     util::replace_suffix(&f.name, suffixes_str),
@@ -698,8 +705,8 @@ pub fn fields(
                 format!("Field `{}` writer - {}", f.name, description)
             };
 
-            mod_items.extend(if field_dim.is_some() {
-                quote! {
+            if field_dim.is_some() {
+                mod_items.extend(quote! {
                     #[doc = #doc]
                     pub struct #name_pc_w<'a> {
                         w: &'a mut W,
@@ -710,7 +717,10 @@ pub fn fields(
                         #proxy_items
                         #proxy_items_fa
                     }
+                });
 
+                #[cfg(feature = "const-generic")]
+                mod_items.extend(quote! {
                     #[doc = #cgdoc]
                     pub struct #name_pc_cgw<'a, const O: usize> {
                         w: &'a mut W,
@@ -720,9 +730,9 @@ pub fn fields(
                         #proxy_items
                         #proxy_items_cg
                     }
-                }
+                });
             } else {
-                quote! {
+                mod_items.extend(quote! {
                     #[doc = #doc]
                     pub struct #name_pc_w<'a> {
                         w: &'a mut W,
@@ -731,8 +741,8 @@ pub fn fields(
                     impl<'a> #name_pc_w<'a> {
                         #proxy_items
                     }
-                }
-            });
+                });
+            }
 
             if let Some((first, dim, increment, suffixes, suffixes_str)) = &field_dim {
                 let offset_calc = calculate_offset(*first, *increment, offset);
@@ -755,6 +765,15 @@ pub fn fields(
                         &suffix,
                     );
                     let sub_offset = util::unsuffixed(sub_offset as u64);
+                    #[cfg(not(feature = "const-generic"))]
+                    w_impl_items.extend(quote! {
+                        #[doc = #doc]
+                        #inline
+                        pub fn #name_sc_n(&mut self) -> #name_pc_w {
+                            #name_pc_w { w: self, offset: #sub_offset }
+                        }
+                    });
+                    #[cfg(feature = "const-generic")]
                     w_impl_items.extend(quote! {
                         #[doc = #doc]
                         #inline