Merge branch 'master' of github.com:paritytech/ink into robin-impleme…

…nt-trait-codegen

# Conflicts:
#	lang/src/lib.rs

lang/macro/src/ink_test.rs

@@ -15,10 +15,8 @@
 use crate::{
     codegen::GenerateCode as _,
     ir,
-    lint,
 };
 use core::convert::TryFrom;
-use ink_lang_ir::format_err_spanned;
 use proc_macro2::TokenStream as TokenStream2;
 use syn::Result;
 
@@ -30,16 +28,6 @@ pub fn generate(input: TokenStream2) -> TokenStream2 {
 }
 
 pub fn generate_or_err(input: TokenStream2) -> Result<TokenStream2> {
-    lint::idents_respect_pred(
-        input.clone(),
-        move |ident| !ident.to_string().starts_with("__ink"),
-        move |ident| {
-            format_err_spanned!(
-                ident,
-                "identifiers starting with `__ink` are forbidden in ink!"
-            )
-        },
-    )?;
     let rust_fn = syn::parse2::<syn::ItemFn>(input)?;
     let ink_ir = ir::InkTest::try_from(rust_fn)?;
     Ok(ink_ir.generate_code())

lang/src/lib.rs

@@ -25,6 +25,7 @@ mod traits;
 pub use ink_lang_macro::{
     contract,
     trait_definition,
+    test,
 };
 
 pub use self::{