diff --git a/substrate/Cargo.lock b/substrate/Cargo.lock index 0662c3da6d..be1c28c854 100644 --- a/substrate/Cargo.lock +++ b/substrate/Cargo.lock @@ -6986,7 +6986,6 @@ version = "3.0.0" dependencies = [ "log", "sp-core", - "sp-std", "sp-wasm-interface", "thiserror", ] @@ -7962,7 +7961,6 @@ dependencies = [ name = "sc-runtime-test" version = "2.0.0" dependencies = [ - "sc-allocator", "sp-core", "sp-io", "sp-runtime", diff --git a/substrate/client/allocator/Cargo.toml b/substrate/client/allocator/Cargo.toml index 4911e47dfd..43a3bae4e5 100644 --- a/substrate/client/allocator/Cargo.toml +++ b/substrate/client/allocator/Cargo.toml @@ -14,16 +14,7 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -sp-std = { version = "3.0.0", path = "../../primitives/std", default-features = false } -sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false } -sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface", default-features = false } +sp-core = { version = "3.0.0", path = "../../primitives/core" } +sp-wasm-interface = { version = "3.0.0", path = "../../primitives/wasm-interface" } log = "0.4.11" -thiserror = { version = "1.0.21" } - -[features] -default = [ "std" ] -std = [ - "sp-std/std", - "sp-core/std", - "sp-wasm-interface/std", -] +thiserror = "1.0.21" diff --git a/substrate/client/allocator/src/error.rs b/substrate/client/allocator/src/error.rs index d28484d34f..e880e8d0ae 100644 --- a/substrate/client/allocator/src/error.rs +++ b/substrate/client/allocator/src/error.rs @@ -16,8 +16,7 @@ // limitations under the License. /// The error type used by the allocators. -#[derive(sp_core::RuntimeDebug)] -#[derive(thiserror::Error)] +#[derive(thiserror::Error, Debug)] pub enum Error { /// Someone tried to allocate more memory than the allowed maximum per allocation. #[error("Requested allocation size is too large")] diff --git a/substrate/client/allocator/src/freeing_bump.rs b/substrate/client/allocator/src/freeing_bump.rs index 1fc6dc31f7..0f3639803f 100644 --- a/substrate/client/allocator/src/freeing_bump.rs +++ b/substrate/client/allocator/src/freeing_bump.rs @@ -67,7 +67,7 @@ //! This is more pronounced (in terms of absolute heap amounts) with larger allocation sizes. use crate::Error; -use sp_std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}}; +use std::{mem, convert::{TryFrom, TryInto}, ops::{Range, Index, IndexMut}}; use sp_wasm_interface::{Pointer, WordSize}; /// The minimal alignment guaranteed by this allocator. diff --git a/substrate/client/executor/runtime-test/Cargo.toml b/substrate/client/executor/runtime-test/Cargo.toml index 2f06556644..9e1cd5bb09 100644 --- a/substrate/client/executor/runtime-test/Cargo.toml +++ b/substrate/client/executor/runtime-test/Cargo.toml @@ -13,7 +13,6 @@ repository = "https://github.com/paritytech/substrate/" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -sc-allocator = { version = "3.0.0", default-features = false, path = "../../allocator" } sp-core = { version = "3.0.0", default-features = false, path = "../../../primitives/core" } sp-io = { version = "3.0.0", default-features = false, path = "../../../primitives/io" } sp-runtime = { version = "3.0.0", default-features = false, path = "../../../primitives/runtime" } @@ -27,7 +26,6 @@ substrate-wasm-builder = { version = "4.0.0", path = "../../../utils/wasm-builde [features] default = [ "std" ] std = [ - "sc-allocator/std", "sp-core/std", "sp-io/std", "sp-runtime/std",