Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Clean up sc-allocator #9295

Merged
bkchr merged 1 commit into from
Jul 7, 2021
Merged

Clean up sc-allocator #9295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 3 additions & 12 deletions client/allocator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 1 addition & 2 deletions client/allocator/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down
2 changes: 1 addition & 1 deletion client/allocator/src/freeing_bump.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions client/executor/runtime-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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",
Expand Down