pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 17:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve unresolved error nits of #7617 (#7631)

Browse Source 
* handle executor should_panic test better

* Revert "reduce should panic, due to extended error messages"

This reverts commit c0805940184a62cd9302603ad911c3591e70a60c.

* remove excessive constraints

* remove duplicate documentation messages for error variants

* reduce T: constraints to the abs minimum

* whoops

* fewer bounds again

Co-authored-by: Bernhard Schuster <bernhard@parity.io>
This commit is contained in:
Bernhard Schuster
2020-11-30 16:53:33 +01:00
committed by GitHub
parent 1cbfc9257f
commit 4ccf6672b1
7 changed files with 46 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/primitives/allocator/Cargo.toml
+3 -3
View File
@@ -17,8 +17,8 @@ targets = ["x86_64-unknown-linux-gnu"]
sp-std = { version = "2.0.0", path = "../std", default-features = false }
sp-core = { version = "2.0.0", path = "../core", default-features = false }
sp-wasm-interface = { version = "2.0.0", path = "../wasm-interface", default-features = false }
log = { version = "0.4.8", optional = true }
derive_more = { version = "0.99.2", optional = true }
log = { version = "0.4.11", optional = true }
thiserror = { version = "1.0.21", optional = true }
[features]
default = [ "std" ]
@@ -27,5 +27,5 @@ std = [
"sp-core/std",
"sp-wasm-interface/std",
"log",
"derive_more",
"thiserror",
]
substrate/primitives/allocator/src/error.rs
+4 -12
View File
@@ -17,23 +17,15 @@
/// The error type used by the allocators.
#[derive(sp_core::RuntimeDebug)]
#[cfg_attr(feature = "std", derive(derive_more::Display))]
#[cfg_attr(feature = "std", derive(thiserror::Error))]
pub enum Error {
/// Someone tried to allocate more memory than the allowed maximum per allocation.
#[cfg_attr(feature = "std", display(fmt="Requested allocation size is too large"))]
#[cfg_attr(feature = "std", error("Requested allocation size is too large"))]
RequestedAllocationTooLarge,
/// Allocator run out of space.
#[cfg_attr(feature = "std", display(fmt="Allocator ran out of space"))]
#[cfg_attr(feature = "std", error("Allocator ran out of space"))]
AllocatorOutOfSpace,
/// Some other error occurred.
#[cfg_attr(feature = "std", error("Other: {0}"))]
Other(&'static str)
}
#[cfg(feature = "std")]
impl std::error::Error for Error {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
match self {
_ => None,
}
}
}