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

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

Merged
merged 4 commits into from
Feb 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion primitives/application-crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,9 @@ std = [ "full_crypto", "sp-core/std", "codec/std", "serde", "sp-std/std", "sp-io
# or Intel SGX.
# For the regular wasm runtime builds this should not be used.
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",
]
5 changes: 2 additions & 3 deletions primitives/io/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), feature(alloc_error_handler))]
#![cfg_attr(not(feature = "std"), feature(core_intrinsics))]

#![cfg_attr(feature = "std",
doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
Expand Down Expand Up @@ -892,7 +891,7 @@ pub fn panic(info: &core::panic::PanicInfo) -> ! {
unsafe {
let message = sp_std::alloc::format!("{}", info);
logging::log(LogLevel::Error, "runtime", message.as_bytes());
core::intrinsics::abort()
core::arch::wasm32::unreachable();
}
}

Expand All @@ -902,7 +901,7 @@ pub fn panic(info: &core::panic::PanicInfo) -> ! {
pub fn oom(_: core::alloc::Layout) -> ! {
unsafe {
logging::log(LogLevel::Error, "runtime", b"Runtime memory exhausted. Aborting");
core::intrinsics::abort();
core::arch::wasm32::unreachable();
}
}

Expand Down
1 change: 0 additions & 1 deletion primitives/sandbox/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

#![warn(missing_docs)]
#![cfg_attr(not(feature = "std"), no_std)]
#![cfg_attr(not(feature = "std"), feature(core_intrinsics))]

use sp_std::prelude::*;

Expand Down
2 changes: 1 addition & 1 deletion primitives/std/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
//! 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"), feature(core_intrinsics))]


#![cfg_attr(feature = "std",
doc = "Substrate runtime standard library as compiled when linked with Rust's standard library.")]
Expand Down
1 change: 0 additions & 1 deletion primitives/std/without_std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ pub use core::convert;
pub use core::default;
pub use core::fmt;
pub use core::hash;
pub use core::intrinsics;
pub use core::iter;
pub use core::marker;
pub use core::mem;
Expand Down