feat(atoll): implement first cut ATOLL implementation

codegen/src/block/layout.rs

@@ -2,7 +2,6 @@ use darling::ast::{Fields, Style};
 use darling::{ast, FromDeriveInput, FromField, FromMeta, FromVariant};
 use proc_macro2::TokenStream;
 use quote::{format_ident, quote, ToTokens};
-use syn::parse_quote;
 
 use crate::substrate_ident;
 use type_dispatch::derive::{add_trait_bounds, struct_body};
@@ -93,8 +92,7 @@ fn transform_field_decl(_idx: usize, field: &DataField) -> TokenStream {
         ref attrs,
     } = field;
     let substrate = substrate_ident();
-    let field_ty =
-        quote!(#substrate::geometry::transform::Transformed<'__substrate_derive_lifetime, #ty>);
+    let field_ty = quote!(#substrate::geometry::transform::Transformed<#ty>);
 
     match ident {
         Some(ident) => {
@@ -151,12 +149,7 @@ impl ToTokens for DataInputReceiver {
             quote!(#substrate::geometry::transform::HasTransformedView),
         );
 
-        let lifetime: syn::GenericParam = parse_quote!('__substrate_derive_lifetime);
-        let mut ref_generics = generics.clone();
-        ref_generics.params.push(lifetime.clone());
-
         let (imp, ty, wher) = generics.split_for_impl();
-        let (_ref_imp, ref_ty, _ref_wher) = ref_generics.split_for_impl();
         let transformed_ident = format_ident!("{}TransformedView", ident);
 
         let expanded = match data {
@@ -179,15 +172,15 @@ impl ToTokens for DataInputReceiver {
 
                 quote! {
                     #(#attrs)*
-                    #vis struct #transformed_ident #ref_generics #body
+                    #vis struct #transformed_ident #generics #body
 
                     impl #imp #substrate::geometry::transform::HasTransformedView for #ident #ty #wher {
-                        type TransformedView<#lifetime> = #transformed_ident #ref_ty;
+                        type TransformedView = #transformed_ident #ty;
 
                         fn transformed_view(
                             &self,
                             __substrate_derive_transformation: #substrate::geometry::transform::Transformation,
-                        ) -> Self::TransformedView<'_> {
+                        ) -> Self::TransformedView {
                             #retval
                         }
                     }
@@ -200,16 +193,16 @@ impl ToTokens for DataInputReceiver {
                     .map(|v| transform_variant_match_arm(transformed_ident.clone(), v));
                 quote! {
                     #(#attrs)*
-                    #vis enum #transformed_ident #ref_generics {
+                    #vis enum #transformed_ident #generics {
                         #( #decls )*
                     }
                     impl #imp #substrate::geometry::transform::HasTransformedView for #ident #ty #wher {
-                        type TransformedView<#lifetime> = #transformed_ident #ref_ty;
+                        type TransformedView = #transformed_ident #ty;
 
                         fn transformed_view(
                             &self,
                             __substrate_derive_transformation: #substrate::geometry::transform::Transformation,
-                        ) -> Self::TransformedView<'_> {
+                        ) -> Self::TransformedView {
                             match self {
                                 #(#arms)*
                             }
@@ -277,7 +270,7 @@ impl ToTokens for HasLayoutInputReceiver {
                     fn layout(
                         &self,
                         io: &mut <<Self as #substrate::block::Block>::Io as #substrate::io::layout::HardwareType>::Builder,
-                        cell: &mut #substrate::layout::CellBuilder<#pdk, Self>,
+                        cell: &mut #substrate::layout::CellBuilder<#pdk>,
                     ) -> #substrate::error::Result<Self::LayoutData> {
 
                         let source = { #source };

codegen/src/io.rs

@@ -332,15 +332,6 @@ pub(crate) fn layout_io(input: &IoInputReceiver) -> TokenStream {
 
     let substrate = substrate_ident();
 
-    let lifetime: syn::GenericParam = parse_quote!('__substrate_derive_lifetime);
-    let mut ref_generics = generics.clone();
-    ref_generics.params.push(lifetime.clone());
-    add_trait_bounds(
-        &mut ref_generics,
-        quote!(#substrate::io::layout::HardwareType),
-    );
-    add_trait_bounds(&mut ref_generics, quote!(::std::any::Any));
-
     let mut lt_generics = generics.clone();
     add_trait_bounds(
         &mut lt_generics,
@@ -355,23 +346,18 @@ pub(crate) fn layout_io(input: &IoInputReceiver) -> TokenStream {
     let mut hbf_generics = lt_generics.clone();
 
     let mut idents = Vec::new();
-    for param in &ref_generics.params {
+    for param in &lt_generics.params {
         if let syn::GenericParam::Type(ref type_param) = *param {
             idents.push(type_param.ident.clone());
         }
     }
-    let ref_wher = ref_generics.make_where_clause();
     for ident in idents {
-        ref_wher.predicates.push(
-            syn::parse_quote!(<#ident as substrate::io::layout::HardwareType>::Bundle: #lifetime),
-        );
         hbf_generics.make_where_clause().predicates.push(syn::parse_quote!(<#ident as #substrate::io::layout::HardwareType>::Builder: #substrate::io::layout::HierarchicalBuildFrom<#substrate::layout::element::NamedPorts>));
     }
 
     let (hbf_imp, hbf_ty, hbf_where) = hbf_generics.split_for_impl();
 
     let (_imp, ty, _wher) = generics.split_for_impl();
-    let (_ref_imp, ref_ty, _ref_wher) = ref_generics.split_for_impl();
     let fields = data.as_ref().take_struct().unwrap();
 
     if let Some(layout_type) = layout_type {
@@ -430,7 +416,7 @@ pub(crate) fn layout_io(input: &IoInputReceiver) -> TokenStream {
             #declare <#field_ty as #substrate::io::layout::HardwareType>::Builder,
         });
         transformed_layout_data_fields.push(quote! {
-                #declare #substrate::geometry::transform::Transformed<#lifetime, <#field_ty as #substrate::io::layout::HardwareType>::Bundle>,
+                #declare #substrate::geometry::transform::Transformed<<#field_ty as #substrate::io::layout::HardwareType>::Bundle>,
             });
         flatten_port_geometry_fields.push(quote! {
                 <<#field_ty as #substrate::io::layout::HardwareType>::Bundle as #substrate::io::Flatten<#substrate::io::layout::PortGeometry>>::flatten(&#refer, __substrate_output_sink);
@@ -515,15 +501,15 @@ pub(crate) fn layout_io(input: &IoInputReceiver) -> TokenStream {
         }
 
         #(#attrs)*
-        #vis struct #transformed_layout_data_ident #ref_generics #transformed_layout_data_body
+        #vis struct #transformed_layout_data_ident #lt_generics #transformed_layout_data_body
 
         impl #lt_any_imp #substrate::geometry::transform::HasTransformedView for #layout_data_ident #lt_any_ty #lt_any_where {
-            type TransformedView<#lifetime> = #transformed_layout_data_ident #ref_ty;
+            type TransformedView = #transformed_layout_data_ident #lt_ty;
 
             fn transformed_view(
                 &self,
                 trans: #substrate::geometry::transform::Transformation,
-            ) -> Self::TransformedView<'_> {
+            ) -> Self::TransformedView {
                 #transformed_layout_data_ident #transformed_view_body
             }
         }