to_tokens

burrbull · burrbull · commit 6d576792d5ff · 2022-10-30T08:50:28.000+03:00
diff --git a/src/generate/device.rs b/src/generate/device.rs
@@ -170,12 +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 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 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! {

Original file line number	Diff line number	Diff line change
`@@ -170,12 +170,10 @@ pub fn render(d: &Device, config: &Config, device_x: &mut String) -> Result<Toke`
`170`	`170`	`} else {`
`171`	`171`	`let mut tokens = syn::parse_file(generic_file)?.into_token_stream();`
`172`	`172`	`if config.target == Target::Msp430 && config.nightly {`
`173`		`- let generic_msp430_atomic = syn::parse_file(msp430_atomic_file)?.into_token_stream();`
`174`		`- tokens.extend(generic_msp430_atomic);`
	`173`	`+ syn::parse_file(msp430_atomic_file)?.to_tokens(&mut tokens);`
`175`	`174`	`}`
`176`	`175`	`if config.const_generic {`
`177`		`- let generic_array_proxy = syn::parse_file(array_proxy)?.into_token_stream();`
`178`		`- tokens.extend(generic_array_proxy);`
	`176`	`+ syn::parse_file(array_proxy)?.to_tokens(&mut tokens);`
`179`	`177`	`}`
`180`	`178`
`181`	`179`	`out.extend(quote! {`