Implement trait support - Part 2/3 - New ink! codegen

Cargo.toml

@@ -7,6 +7,7 @@ members = [
     "lang",
     "lang/macro",
     "lang/ir",
+    "lang/codegen",
     "prelude",
     "primitives",
 ]

core/derive/src/packed_layout.rs

@@ -17,9 +17,9 @@ use quote::quote;
 
 /// Derives `ink_core`'s `PackedLayout` trait for the given `struct` or `enum`.
 pub fn packed_layout_derive(mut s: synstructure::Structure) -> TokenStream2 {
-    s.bind_with(|_| synstructure::BindStyle::Move);
-    s.add_bounds(synstructure::AddBounds::Generics);
-
+    s.bind_with(|_| synstructure::BindStyle::Move)
+        .add_bounds(synstructure::AddBounds::Generics)
+        .underscore_const(true);
     let pull_body = s.each(|binding| {
         quote! { ::ink_core::storage2::traits::PackedLayout::pull_packed(#binding, __key); }
     });
@@ -29,7 +29,6 @@ pub fn packed_layout_derive(mut s: synstructure::Structure) -> TokenStream2 {
     let clear_body = s.each(|binding| {
         quote! { ::ink_core::storage2::traits::PackedLayout::clear_packed(#binding, __key); }
     });
-
     s.gen_impl(quote! {
         gen impl ::ink_core::storage2::traits::PackedLayout for @Self {
             fn pull_packed(&mut self, __key: &::ink_primitives::Key) {

core/derive/src/spread_layout.rs

@@ -197,8 +197,9 @@ fn spread_layout_enum_derive(s: &synstructure::Structure) -> TokenStream2 {
 
 /// Derives `ink_core`'s `SpreadLayout` trait for the given `struct` or `enum`.
 pub fn spread_layout_derive(mut s: synstructure::Structure) -> TokenStream2 {
-    s.bind_with(|_| synstructure::BindStyle::Move);
-    s.add_bounds(synstructure::AddBounds::Generics);
+    s.bind_with(|_| synstructure::BindStyle::Move)
+        .add_bounds(synstructure::AddBounds::Generics)
+        .underscore_const(true);
     match s.ast().data {
         syn::Data::Struct(_) => spread_layout_struct_derive(&s),
         syn::Data::Enum(_) => spread_layout_enum_derive(&s),

core/derive/src/storage_layout.rs

@@ -104,8 +104,9 @@ fn storage_layout_enum(s: &synstructure::Structure) -> TokenStream2 {
 }
 
 pub fn storage_layout_derive(mut s: synstructure::Structure) -> TokenStream2 {
-    s.bind_with(|_| synstructure::BindStyle::Move);
-    s.add_bounds(synstructure::AddBounds::Generics);
+    s.bind_with(|_| synstructure::BindStyle::Move)
+        .add_bounds(synstructure::AddBounds::Generics)
+        .underscore_const(true);
     match s.ast().data {
         syn::Data::Struct(_) => storage_layout_struct(&s),
         syn::Data::Enum(_) => storage_layout_enum(&s),

core/derive/src/tests/packed_layout.rs

@@ -21,8 +21,7 @@ fn unit_struct_works() {
             struct UnitStruct;
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_PackedLayout_FOR_UnitStruct: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::PackedLayout for UnitStruct {
                     fn pull_packed(&mut self, __key: &::ink_primitives::Key) {
                         match self {
@@ -59,8 +58,7 @@ fn struct_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_PackedLayout_FOR_NamedFields: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::PackedLayout for NamedFields {
                     fn pull_packed(&mut self, __key: &::ink_primitives::Key) {
                         match self {
@@ -137,8 +135,7 @@ fn enum_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_PackedLayout_FOR_MixedEnum: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::PackedLayout for MixedEnum {
                     fn pull_packed(&mut self, __key: &::ink_primitives::Key) {
                         match self {
@@ -229,8 +226,7 @@ fn generic_struct_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_PackedLayout_FOR_GenericStruct: () = {
+            const _: () = {
                 impl<T1, T2> ::ink_core::storage2::traits::PackedLayout for GenericStruct<T1, T2>
                 where
                     T1: ::ink_core::storage2::traits::PackedLayout,
@@ -298,8 +294,7 @@ fn generic_enum_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_PackedLayout_FOR_GenericEnum: () = {
+            const _: () = {
                 impl<T1, T2> ::ink_core::storage2::traits::PackedLayout for GenericEnum<T1, T2>
                 where
                     T1: ::ink_core::storage2::traits::PackedLayout,

core/derive/src/tests/spread_layout.rs

@@ -21,8 +21,7 @@ fn unit_struct_works() {
             struct UnitStruct;
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_SpreadLayout_FOR_UnitStruct: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::SpreadLayout for UnitStruct {
                     #[allow(unused_comparisons)]
                     const FOOTPRINT: u64 = [0u64, 0u64][(0u64 < 0u64) as usize];
@@ -61,8 +60,7 @@ fn struct_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_SpreadLayout_FOR_NamedFields: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::SpreadLayout for NamedFields {
                     #[allow(unused_comparisons)]
                     const FOOTPRINT: u64 = [
@@ -172,8 +170,7 @@ fn enum_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_SpreadLayout_FOR_MixedEnum: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::SpreadLayout for MixedEnum {
                     #[allow(unused_comparisons)]
                     const FOOTPRINT : u64 = 1 + [
@@ -447,8 +444,7 @@ fn generic_struct_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_SpreadLayout_FOR_GenericStruct: () = {
+            const _: () = {
                 impl<T1, T2> ::ink_core::storage2::traits::SpreadLayout for GenericStruct<T1, T2>
                 where
                     T1: ::ink_core::storage2::traits::SpreadLayout,
@@ -544,8 +540,7 @@ fn generic_enum_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_SpreadLayout_FOR_GenericEnum: () = {
+            const _: () = {
                 impl<T1, T2> ::ink_core::storage2::traits::SpreadLayout for GenericEnum<T1, T2>
                 where
                     T1: ::ink_core::storage2::traits::SpreadLayout,

core/derive/src/tests/storage_layout.rs

@@ -21,8 +21,7 @@ fn unit_struct_works() {
             struct UnitStruct;
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_StorageLayout_FOR_UnitStruct: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::StorageLayout for UnitStruct {
                     fn layout(__key_ptr: &mut ::ink_core::storage2::traits::KeyPtr) -> ::ink_metadata::layout2::Layout {
                         ::ink_metadata::layout2::Layout::Struct(
@@ -42,8 +41,7 @@ fn tuple_struct_works() {
             struct TupleStruct(bool, u32, i64);
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_StorageLayout_FOR_TupleStruct: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::StorageLayout for TupleStruct {
                     fn layout(__key_ptr: &mut ::ink_core::storage2::traits::KeyPtr) -> ::ink_metadata::layout2::Layout {
                         ::ink_metadata::layout2::Layout::Struct(
@@ -80,8 +78,7 @@ fn named_fields_struct_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_StorageLayout_FOR_NamedFieldsStruct: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::StorageLayout for NamedFieldsStruct {
                     fn layout(__key_ptr: &mut ::ink_core::storage2::traits::KeyPtr) -> ::ink_metadata::layout2::Layout {
                         ::ink_metadata::layout2::Layout::Struct(
@@ -114,8 +111,7 @@ fn clike_enum_works() {
             enum ClikeEnum { A, B, C }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_StorageLayout_FOR_ClikeEnum: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::StorageLayout for ClikeEnum {
                     fn layout(__key_ptr: &mut ::ink_core::storage2::traits::KeyPtr) -> ::ink_metadata::layout2::Layout {
                         let dispatch_key = __key_ptr.advance_by(1);
@@ -172,8 +168,7 @@ fn mixed_enum_works() {
             }
         }
         expands to {
-            #[allow(non_upper_case_globals)]
-            const _DERIVE_ink_core_storage2_traits_StorageLayout_FOR_MixedEnum: () = {
+            const _: () = {
                 impl ::ink_core::storage2::traits::StorageLayout for MixedEnum {
                     fn layout(__key_ptr: &mut ::ink_core::storage2::traits::KeyPtr) -> ::ink_metadata::layout2::Layout {
                         let dispatch_key = __key_ptr.advance_by(1);

core/src/env/api.rs

@@ -21,9 +21,9 @@ use crate::env::{
         TypedEnv,
     },
     call::{
+        utils::ReturnType,
         CallParams,
-        InstantiateParams,
-        ReturnType,
+        CreateParams,
     },
     engine::{
         EnvInstance,
@@ -313,7 +313,7 @@ where
 /// - If given insufficient endowment.
 /// - If the returned account ID failed to decode properly.
 pub fn instantiate_contract<T, Args, C>(
-    params: &InstantiateParams<T, Args, C>,
+    params: &CreateParams<T, Args, C>,
 ) -> Result<T::AccountId>
 where
     T: EnvTypes,

core/src/env/backend.rs

@@ -14,9 +14,9 @@
 
 use crate::env::{
     call::{
+        utils::ReturnType,
         CallParams,
-        InstantiateParams,
-        ReturnType,
+        CreateParams,
     },
     EnvTypes,
     Result,
@@ -278,7 +278,7 @@ pub trait TypedEnv: Env {
     /// For more details visit: [`ink_core::env::instantiate_contract`]
     fn instantiate_contract<T, Args, C>(
         &mut self,
-        params: &InstantiateParams<T, Args, C>,
+        params: &CreateParams<T, Args, C>,
     ) -> Result<T::AccountId>
     where
         T: EnvTypes,