use-ink
diff --git a/‎.gitlab-ci.yml
Lines changed: 7 additions & 7 deletions b/‎.gitlab-ci.yml
Lines changed: 7 additions & 7 deletions
diff --git a/‎CONTRIBUTING.md
Lines changed: 1 addition & 1 deletion b/‎CONTRIBUTING.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎Cargo.toml
Lines changed: 1 addition & 3 deletions b/‎Cargo.toml
Lines changed: 1 addition & 3 deletions
diff --git a/‎LICENSE_TEMPLATE
Lines changed: 1 addition & 1 deletion b/‎LICENSE_TEMPLATE
Lines changed: 1 addition & 1 deletion
diff --git a/‎README.md
Lines changed: 7 additions & 8 deletions b/‎README.md
Lines changed: 7 additions & 8 deletions
diff --git a/‎RELEASES.md
Lines changed: 9 additions & 9 deletions b/‎RELEASES.md
Lines changed: 9 additions & 9 deletions
diff --git a/‎abi/Cargo.toml
Lines changed: 1 addition & 0 deletions b/‎abi/Cargo.toml
Lines changed: 1 addition & 0 deletions
diff --git a/‎abi/derive/src/has_layout.rs
Lines changed: 2 additions & 3 deletions b/‎abi/derive/src/has_layout.rs
Lines changed: 2 additions & 3 deletions
diff --git a/‎abi/derive/src/impl_wrapper.rs
Lines changed: 3 additions & 24 deletions b/‎abi/derive/src/impl_wrapper.rs
Lines changed: 3 additions & 24 deletions
diff --git a/‎abi/src/layout.rs
Lines changed: 14 additions & 1 deletion b/‎abi/src/layout.rs
Lines changed: 14 additions & 1 deletion
diff --git a/‎core/Cargo.toml
Lines changed: 14 additions & 6 deletions b/‎core/Cargo.toml
Lines changed: 14 additions & 6 deletions
diff --git a/‎core/derive/tests/ui/pass/allocate_using.rs
Lines changed: 1 addition & 1 deletion b/‎core/derive/tests/ui/pass/allocate_using.rs
Lines changed: 1 addition & 1 deletion
@@ -18,7 +18,7 @@ variables:
   CARGO_TARGET_DIR:                "/ci-cache/${CI_PROJECT_NAME}/targets/${CI_COMMIT_REF_NAME}/${CI_JOB_NAME}"
   CI_SERVER_NAME:                  "GitLab CI"
   REGISTRY:                        registry.parity.io/parity/infrastructure/scripts
-  ALL_CRATES:                      "core alloc prelude utils lang2 lang2/macro"
+  ALL_CRATES:                      "core alloc prelude primitives lang lang/macro"
 
 .collect-artifacts:                &collect-artifacts
   artifacts:
@@ -147,31 +147,31 @@ examples-test:
   stage:                           examples
   <<:                              *docker-env
   script:
-    - for example in examples/lang2/*; do
+    - for example in examples/*/; do
         cargo test --verbose --manifest-path ${example}/Cargo.toml;
       done
 
 examples-fmt:
   stage:                           examples
   <<:                              *docker-env
   script:
-    - for example in examples/lang2/*; do
+    - for example in examples/*/; do
         cargo fmt --verbose --manifest-path ${example}/Cargo.toml -- --check;
       done
 
 examples-clippy-std:
   stage:                           examples
   <<:                              *docker-env
   script:
-    - for example in examples/lang2/*; do
+    - for example in examples/*/; do
         cargo clippy --verbose --manifest-path ${example}/Cargo.toml -- -D warnings;
       done
 
 examples-clippy-wasm:
   stage:                           examples
   <<:                              *docker-env
   script:
-    - for example in examples/lang2/*; do
+    - for example in examples/*/; do
         cargo clippy --verbose --manifest-path ${example}/Cargo.toml --no-default-features --target wasm32-unknown-unknown -- -D warnings;
       done
 
@@ -180,7 +180,7 @@ examples-contract-build:
   <<:                              *docker-env
   script:
     - *update-cargo-contract
-    - for example in examples/lang2/*; do
+    - for example in examples/*/; do
         pushd $example &&
         cargo contract build &&
         popd;
@@ -191,7 +191,7 @@ examples-generate-metadata:
   <<:                              *docker-env
   script:
     - *update-cargo-contract
-    - for example in examples/lang2/*; do
+    - for example in examples/*/; do
         pushd $example &&
         cargo contract generate-metadata &&
         popd;
 
@@ -34,7 +34,7 @@ Following these will ensure that your pull request is going to be accepted.
 
 1. Run `rustfmt` automatically.
 1. Run `clippy` on your changes.
-1. Run tests in `debug` and `release` mode using `--features test-env` for off-chain testing.
+1. Run tests via `cargo test --release` for off-chain testing.
 1. For critical parts perform some manual on-chain tests.
 1. Build the code and run tests also for the `wasm32` target.
 1. Try to run some examples and see if they are still working correctly.
 
@@ -4,10 +4,8 @@ members = [
     "abi",
     "core",
     "lang",
-    "lang2",
-    "model",
     "prelude",
-    "utils",
+    "primitives",
 ]
 exclude = [
     "examples/",
 
@@ -1,4 +1,4 @@
-// Copyright 2018-2019 Parity Technologies (UK) Ltd.
+// Copyright {20\d{2}}-{20\d{2}} Parity Technologies (UK) Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 
@@ -14,8 +14,6 @@
 [e2]: https://github.com/Aaronepower/tokei#badges
 [f1]: https://img.shields.io/badge/docs-core-blue.svg
 [f2]: https://paritytech.github.io/ink/ink_core
-[g1]: https://img.shields.io/badge/docs-model-blue.svg
-[g2]: https://paritytech.github.io/ink/ink_model
 [h1]: https://img.shields.io/badge/docs-abi-blue.svg
 [h2]: https://paritytech.github.io/ink/ink_abi
 
@@ -27,9 +25,9 @@ For more information please visit [the ink! tutorial](https://substrate.dev/subs
 
 ## Developer Documentation
 
-| `ink_abi`     | `ink_core`    | `ink_model`   |
-| ------------- | ------------- | ------------- |
-| [![][h1]][h2] | [![][f1]][f2] | [![][g1]][g2] |
+| `ink_abi`     | `ink_core`    |
+| ------------- | ------------- |
+| [![][h1]][h2] | [![][f1]][f2] |
 
 ### Interaction with Substrate
 
@@ -81,14 +79,15 @@ To create your own version of the flipper contract, you first need to initialize
 cargo contract new flipper
 ```
 
-Below you can see the code using the `ink_lang2` version of ink!.
+Below you can see the code using the `ink_lang` version of ink!.
 
 ```rust
-use ink_core::storage;
-use ink_lang2 as ink;
+use ink_lang as ink;
 
 #[ink::contract(version = "0.1.0")]
 mod flipper {
+    use ink_core::storage;
+
     /// The storage of the flipper contract.
     #[ink(storage)]
     struct Flipper {
 
@@ -64,7 +64,7 @@ contract! {
 <td>
 
 ```rust
-use ink_lang2 as ink;
+use ink_lang as ink;
 
 #[ink::contract(version = "0.1.0")]
 mod erc20 {
@@ -78,7 +78,7 @@ mod erc20 {
 
 > Note: we now require a mandatory ink! version in the header. You're welcome.
 
-See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/lang2/erc20/src/lib.rs).
+See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/erc20/src/lib.rs).
 
 ## ink! Contract Tag
 
@@ -146,7 +146,7 @@ struct Erc20 {
 </tr>
 </table>
 
-See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/lang2/erc20/src/lib.rs).
+See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/erc20/src/lib.rs).
 
 ## Declaring Events
 
@@ -193,7 +193,7 @@ struct Transfer {
 </tr>
 </table>
 
-See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/lang2/erc20/src/lib.rs).
+See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/erc20/src/lib.rs).
 
 ## Environment Handler
 
@@ -275,7 +275,7 @@ fn total_supply(&self) -> Balance {
 </tr>
 </table>
 
-See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/lang2/erc20/src/lib.rs).
+See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/erc20/src/lib.rs).
 
 ## Defining a Constructor
 
@@ -335,7 +335,7 @@ impl Erc20 {
 </tr>
 </table>
 
-See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/lang2/erc20/src/lib.rs).
+See the [ERC20 example](https://github.com/paritytech/ink/blob/master/examples/erc20/src/lib.rs).
 
 ## Cross Contract Calls
 
@@ -355,7 +355,7 @@ struct Delegator {
 let result = self.adder.inc(by);
 ```
 
-See the [delegator example](https://github.com/paritytech/ink/blob/master/examples/lang2/delegator/lib.rs).
+See the [delegator example](https://github.com/paritytech/ink/blob/master/examples/delegator/lib.rs).
 
 ## Factory Contracts
 
@@ -406,7 +406,7 @@ let accumulator = Accumulator::new(init_value)
 </tr>
 </table>
 
-See the [delegator example](https://github.com/paritytech/ink/blob/master/examples/lang2/delegator/lib.rs).
+See the [delegator example](https://github.com/paritytech/ink/blob/master/examples/delegator/lib.rs).
 
 ## Contract Tests
 
@@ -432,7 +432,7 @@ let contract = MyContract::my_constructor(a, b);
 Messages can simply be called on the returned instance as if `MyContract::my_constructor` returns a
 `Self` instance.
 
-See the [flipper example](https://github.com/paritytech/ink/blob/master/examples/lang2/flipper/src/lib.rs).
+See the [flipper example](https://github.com/paritytech/ink/blob/master/examples/flipper/src/lib.rs).
 
 **The off-chain test environment has lost a bit of power compared to the old ink! language.**
 
 
@@ -19,6 +19,7 @@ serde = { version = "1.0", default-features = false, features = ["derive", "allo
 derive_more = { version = "0.99.2", default-features = false, features = ["from"] }
 ink_abi_derive = { path = "derive", default-features = false, optional = true }
 ink_prelude = { path = "../prelude/", default-features = false }
+ink_primitives = { path = "../primitives/", default-features = false }
 type-metadata = { git = "https://github.com/type-metadata/type-metadata.git", default-features = false, features = ["derive"] }
 
 [dev-dependencies]
 
@@ -60,7 +60,7 @@ pub fn generate_impl(input: TokenStream2) -> Result<TokenStream2> {
         }
     };
 
-    Ok(wrap(ident, "HAS_LAYOUT", has_layout_impl))
+    Ok(wrap(has_layout_impl))
 }
 
 fn generate_fields_layout<'a>(
@@ -97,8 +97,7 @@ fn generate_struct_layout(data_struct: &DataStruct) -> TokenStream2 {
         Fields::Unnamed(ref fs) => generate_struct_fields_layout(&fs.unnamed),
         Fields::Unit => {
             quote! {
-                use type_metadata::Metadata as _;
-                _ink_abi::LayoutStruct::new(Self::meta_type(), __core::vec![])
+                _ink_abi::LayoutStruct::new(<Self as type_metadata::Metadata>::meta_type(), Vec::new())
             }
         }
     }
 
@@ -12,34 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(not(feature = "std"))]
-use alloc::{
-    format,
-    string::{
-        String,
-        ToString,
-    },
-};
-
-use proc_macro2::{
-    Span,
-    TokenStream as TokenStream2,
-};
+use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use syn::Ident;
-
-pub fn wrap(
-    ident: &Ident,
-    trait_name: &'static str,
-    impl_quote: TokenStream2,
-) -> TokenStream2 {
-    let mut renamed = format!("_IMPL_{}_FOR_", trait_name);
-    renamed.push_str(ident.to_string().trim_start_matches("r#"));
-    let dummy_const = Ident::new(&renamed, Span::call_site());
 
+pub fn wrap(impl_quote: TokenStream2) -> TokenStream2 {
     quote! {
         #[allow(non_upper_case_globals, unused_attributes, unused_qualifications)]
-        const #dummy_const: () = {
+        const _: () = {
             #[allow(unknown_lints)]
             #[cfg_attr(feature = "cargo-clippy", allow(useless_attribute))]
             #[allow(rust_2018_idioms)]
 
@@ -41,6 +41,19 @@ pub trait HasLayout {
     fn layout(&self) -> StorageLayout;
 }
 
+impl From<ink_primitives::Key> for LayoutKey {
+    fn from(key: ink_primitives::Key) -> Self {
+        LayoutKey(key.0)
+    }
+}
+
+impl HasLayout for ink_primitives::Key {
+    fn layout(&self) -> StorageLayout {
+        LayoutRange::cell(*self, <[u8; 32] as type_metadata::Metadata>::meta_type())
+            .into()
+    }
+}
+
 /// Either a concrete layout bound or another layout sub-struct.
 #[derive(Debug, PartialEq, Eq, Serialize, From)]
 #[serde(bound = "F::TypeId: Serialize")]
@@ -73,7 +86,7 @@ impl IntoCompact for StorageLayout {
 #[derive(Debug, PartialEq, Eq, From, Serialize)]
 #[serde(transparent)]
 pub struct LayoutKey(
-    /// Internals must be compatible with `ink_core::storage::Key`.
+    /// Internals must be compatible with `ink_primitives::Key`.
     pub [u8; 32],
 );
 
 
@@ -17,27 +17,35 @@ include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]
 [dependencies]
 ink_abi = { path = "../abi/", default-features = false, features = ["derive"], optional = true }
 ink_alloc = { path = "../alloc/", default-features = false }
-ink_utils = { path = "../utils/" }
+ink_primitives = { path = "../primitives/", default-features = false }
 ink_core_derive = { path = "derive", default-features = false }
 ink_prelude = { path = "../prelude/", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.1", default-features = false, features = ["derive", "full"] }
 type-metadata = { git = "https://github.com/type-metadata/type-metadata.git", default-features = false, features = ["derive"], optional = true }
-derive_more = { version = "0.99.2", default-features = false, features = ["from"] }
+derive_more = { version = "0.99.2", default-features = false, features = ["from", "display"] }
 smallvec = { version = "1.0", default-features = false, features = ["union"] }
 cfg-if = "0.1"
+num-traits = { version = "0.2.1", default-features = false, features = ["i128"] }
+
+# Only used in the off-chain environment.
+#
+# Sadly couldn't be marked as dev-dependency.
+# Never use this crate outside of the off-chain environment!
+rand = { version = "0.7", default-features = false, features = ["alloc"], optional = true }
 
 [features]
-default = ["test-env"]
-test-env = [
-    "std",
-]
+default = ["std"]
 std = [
     "ink_abi/std",
     "ink_alloc/std",
     "ink_prelude/std",
+    "ink_primitives/std",
     "scale/std",
     "type-metadata/std",
+    "rand",
+    "rand/std",
+    "num-traits/std",
 ]
 ink-generate-abi = [
     "ink_abi",
 
@@ -16,7 +16,7 @@ mod utils;
 
 use utils::*;
 
-use ink_core::storage::Key;
+use ink_primitives::Key;
 use ink_core_derive::AllocateUsing;
 
 #[derive(Default)]
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2018-2019 Parity Technologies (UK) Ltd.`
	`1`	`+// Copyright {20\d{2}}-{20\d{2}} Parity Technologies (UK) Ltd.`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ pub fn generate_impl(input: TokenStream2) -> Result<TokenStream2> {`
`60`	`60`	`}`
`61`	`61`	`};`
`62`	`62`
`63`		`- Ok(wrap(ident, "HAS_LAYOUT", has_layout_impl))`
	`63`	`+ Ok(wrap(has_layout_impl))`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`fn generate_fields_layout<'a>(`
`@@ -97,8 +97,7 @@ fn generate_struct_layout(data_struct: &DataStruct) -> TokenStream2 {`
`97`	`97`	`Fields::Unnamed(ref fs) => generate_struct_fields_layout(&fs.unnamed),`
`98`	`98`	`Fields::Unit => {`
`99`	`99`	`quote! {`
`100`		`- use type_metadata::Metadata as _;`
`101`		`- _ink_abi::LayoutStruct::new(Self::meta_type(), __core::vec![])`
	`100`	`+ _ink_abi::LayoutStruct::new(<Self as type_metadata::Metadata>::meta_type(), Vec::new())`
`102`	`101`	`}`
`103`	`102`	`}`
`104`	`103`	`}`