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

Substrate Companion for rust 1.54 #3807

Merged
merged 13 commits into from
Sep 24, 2021
4 changes: 3 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ stages:
- publish
- deploy

image: paritytech/ci-linux:production
# FIXME: revert me
# image: paritytech/ci-linux:production
image: paritytech/ci-linux:staging-1.54.0
ordian marked this conversation as resolved.
Show resolved Hide resolved

workflow:
rules:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: Generic type parameters may only be used for exactly one field, but is us
6 | a: X,
| ^

error[E0599]: no method named `replace_a` found for struct `AllSubsystems<u16>` in the current scope
error[E0599]: no method named `replace_a` found for struct `AllSubsystems` in the current scope
--> $DIR/err-01-generic-used-twice.rs:15:17
|
5 | struct AllSubsystems<X> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ error[E0119]: conflicting implementations of trait `std::convert::From<MsgStrukt
| first implementation here
| conflicting implementation for `AllMessages`
|
= note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
= note: this error originates in the attribute macro `overlord` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0119]: conflicting implementations of trait `polkadot_overseer_gen::SubsystemSender<MsgStrukt>` for type `OverseerSubsystemSender`
--> $DIR/err-01-duplicate-consumer.rs:19:1
Expand All @@ -18,4 +18,4 @@ error[E0119]: conflicting implementations of trait `polkadot_overseer_gen::Subsy
| first implementation here
| conflicting implementation for `OverseerSubsystemSender`
|
= note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
= note: this error originates in the attribute macro `overlord` (in Nightly builds, run with -Z macro-backtrace for more info)
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: Must declare the overseer error type via `error=..`.
16 | #[overlord(signal=SigSigSig, event=Event, gen=AllMessages)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
= note: this error originates in the attribute macro `overlord` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0433]: failed to resolve: use of undeclared type `Overseer`
--> $DIR/err-04-missing-error.rs:30:10
Expand Down
8 changes: 3 additions & 5 deletions parachain/test-parachains/halt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,18 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
#[panic_handler]
#[no_mangle]
pub fn panic(_info: &core::panic::PanicInfo) -> ! {
unsafe { core::intrinsics::abort() }
core::intrinsics::abort()
}

#[cfg(not(feature = "std"))]
#[alloc_error_handler]
#[no_mangle]
pub fn oom(_: core::alloc::Layout) -> ! {
unsafe {
core::intrinsics::abort();
}
core::intrinsics::abort();
}

#[cfg(not(feature = "std"))]
#[no_mangle]
pub extern "C" fn validate_block(params: *const u8, len: usize) -> u64 {
pub extern "C" fn validate_block(_params: *const u8, _len: usize) -> u64 {
loop {}
}