From ac0b8b1b45dee7995b3c3edc3638d76f3df43fe9 Mon Sep 17 00:00:00 2001 From: Dmitry Kashitsyn <korvin@deeptown.org> Date: Tue, 19 Jun 2018 16:27:33 +0700 Subject: [PATCH] Reverts `wee_alloc` to a normal versioning scheme (#222) * Reverts wee_alloc to a normal versioning scheme * Removes `global_allocator` attribute, since it's now on by default This feature has been stable since 1.28.0. Attribute no longer needed. --- substrate/polkadot/parachain/test-chains/basic_add/Cargo.toml | 2 +- substrate/polkadot/parachain/test-chains/basic_add/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/substrate/polkadot/parachain/test-chains/basic_add/Cargo.toml b/substrate/polkadot/parachain/test-chains/basic_add/Cargo.toml index 41e745ca1a4..f799cf6b6b8 100644 --- a/substrate/polkadot/parachain/test-chains/basic_add/Cargo.toml +++ b/substrate/polkadot/parachain/test-chains/basic_add/Cargo.toml @@ -9,7 +9,7 @@ crate-type = ["cdylib"] [dependencies] polkadot-parachain = { path = "../../", default-features = false } -wee_alloc = { git = "https://github.com/rustwasm/wee_alloc", rev = "4e9f23fff1f2474962085ca693f8884db666889f" } +wee_alloc = "0.4.1" tiny-keccak = "1.4" pwasm-libc = "0.2" diff --git a/substrate/polkadot/parachain/test-chains/basic_add/src/lib.rs b/substrate/polkadot/parachain/test-chains/basic_add/src/lib.rs index 9d0a8a0d747..723efb307f3 100644 --- a/substrate/polkadot/parachain/test-chains/basic_add/src/lib.rs +++ b/substrate/polkadot/parachain/test-chains/basic_add/src/lib.rs @@ -17,7 +17,7 @@ //! Basic parachain that adds a number as part of its state. #![cfg_attr(not(feature = "std"), no_std)] -#![cfg_attr(not(feature = "std"), feature(alloc, core_intrinsics, global_allocator, lang_items, panic_implementation, core_panic_info))] +#![cfg_attr(not(feature = "std"), feature(alloc, core_intrinsics, lang_items, panic_implementation, core_panic_info))] #[cfg(not(feature = "std"))] extern crate alloc; -- GitLab