Merge #690

690: include_str r=Emilgardis a=burrbull



Co-authored-by: Andrey Zgarbul <[email protected]>

Author: bors[bot]

CHANGELOG.md

@@ -9,12 +9,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Test patched STM32
 - simplify ci strategy
+- Fix generated code for MSP430 atomics
 
 ## [v0.27.1] - 2022-10-25
 
 - Fix cli error with --help/version
 - Don't cast fields with width 17-31 and non-zero offset.
-- Fix generated code for MSP430 atomics
 
 ## [v0.27.0] - 2022-10-24
 

src/generate/device.rs

@@ -146,17 +146,16 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
         });
     }
 
-    let generic_file = std::str::from_utf8(include_bytes!("generic.rs"))?;
+    let generic_file = include_str!("generic.rs");
+    let msp430_atomic_file = include_str!("generic_msp430_atomic.rs");
+    let array_proxy = include_str!("array_proxy.rs");
     if config.generic_mod {
         let mut file = File::create(config.output_dir.join("generic.rs"))?;
         writeln!(file, "{}", generic_file)?;
         if config.target == Target::Msp430 && config.nightly {
-            let msp430_atomic_file =
-                std::str::from_utf8(include_bytes!("generic_msp430_atomic.rs"))?;
             writeln!(file, "\n{}", msp430_atomic_file)?;
         }
         if config.const_generic {
-            let array_proxy = std::str::from_utf8(include_bytes!("array_proxy.rs"))?;
             writeln!(file, "{}", array_proxy)?;
         }
 
@@ -171,15 +170,10 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke
     } else {
         let mut tokens = syn::parse_file(generic_file)?.into_token_stream();
         if config.target == Target::Msp430 && config.nightly {
-            let msp430_atomic_file =
-                std::str::from_utf8(include_bytes!("generic_msp430_atomic.rs"))?;
-            let generic_msp430_atomic = syn::parse_file(msp430_atomic_file)?.into_token_stream();
-            tokens.extend(generic_msp430_atomic);
+            syn::parse_file(msp430_atomic_file)?.to_tokens(&mut tokens);
         }
         if config.const_generic {
-            let array_proxy = std::str::from_utf8(include_bytes!("array_proxy.rs"))?;
-            let generic_array_proxy = syn::parse_file(array_proxy)?.into_token_stream();
-            tokens.extend(generic_array_proxy);
+            syn::parse_file(array_proxy)?.to_tokens(&mut tokens);
         }
 
         out.extend(quote! {