pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-24 21:51:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of in-substrate usages of core_intrinsics feature (#4823)

Browse Source 
* Remove usage of unneeded Rust feature core_intrinsics

* core::intrinsics::abort -> arch::wasm32::unreachable

* Don't publish `core::intrinsics`.

* Disable panic_handler and alloc_error_handler for no_std non wasm builds
This commit is contained in:
Sergei Pepyakin
2020-02-05 17:26:48 +01:00
committed by GitHub
parent c0af995362
commit 1185f3ea30
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/primitives/application-crypto/Cargo.toml
+5 -1
View File
@@ -21,5 +21,9 @@ std = [ "full_crypto", "sp-core/std", "codec/std", "serde", "sp-std/std", "sp-io
# or Intel SGX. # or Intel SGX.
# For the regular wasm runtime builds this should not be used. # For the regular wasm runtime builds this should not be used.
full_crypto = [ full_crypto = [
"sp-core/full_crypto" "sp-core/full_crypto",
# Don't add `panic_handler` and `alloc_error_handler` since they are expected to be provided
# by the user anyway.
"sp-io/disable_panic_handler",
"sp-io/disable_oom",
] ]
substrate/primitives/io/src/lib.rs
+2 -3
View File
@@ -20,7 +20,6 @@
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))] #![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
#![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
#![cfg_attr(feature = "std", #![cfg_attr(feature = "std",
doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")] doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
@@ -892,7 +891,7 @@ pub fn panic(info: &core::panic::PanicInfo) -> ! {
unsafe { unsafe {
let message = sp_std::alloc::format!("{}", info); let message = sp_std::alloc::format!("{}", info);
logging::log(LogLevel::Error, "runtime", message.as_bytes()); logging::log(LogLevel::Error, "runtime", message.as_bytes());
core::intrinsics::abort() core::arch::wasm32::unreachable();
} }
} }
@@ -902,7 +901,7 @@ pub fn panic(info: &core::panic::PanicInfo) -> ! {
pub fn oom(_: core::alloc::Layout) -> ! { pub fn oom(_: core::alloc::Layout) -> ! {
unsafe { unsafe {
logging::log(LogLevel::Error, "runtime", b"Runtime memory exhausted. Aborting"); logging::log(LogLevel::Error, "runtime", b"Runtime memory exhausted. Aborting");
core::intrinsics::abort(); core::arch::wasm32::unreachable();
} }
} }
substrate/primitives/sandbox/src/lib.rs
-1
View File
@@ -36,7 +36,6 @@
#![warn(missing_docs)] #![warn(missing_docs)]
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
use sp_std::prelude::*; use sp_std::prelude::*;
substrate/primitives/std/src/lib.rs
+1 -1
View File
@@ -18,7 +18,7 @@
//! or client/alloc to be used with any code that depends on the runtime. //! or client/alloc to be used with any code that depends on the runtime.
#![cfg_attr(not(feature = "std"), no_std)] #![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), feature(core_intrinsics))]
#![cfg_attr(feature = "std", #![cfg_attr(feature = "std",
doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")] doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
substrate/primitives/std/without_std.rs
-1
View File
@@ -27,7 +27,6 @@ pub use core::convert;
pub use core::default; pub use core::default;
pub use core::fmt; pub use core::fmt;
pub use core::hash; pub use core::hash;
pub use core::intrinsics;
pub use core::iter; pub use core::iter;
pub use core::marker; pub use core::marker;
pub use core::mem; pub use core::mem;