Unverified Commit 501f115c authored by Bastian Köcher's avatar Bastian Köcher Committed by GitHub
Browse files

Substrate Companion for rust 1.54 (#3807)

* Substrate Companion for rust 1.54

* CI: run with a staging CI image

* Revert "CI: run with a staging CI image"

This reverts commit f3b51da0

.

* CI: debug, again

* compilation fixes

* tabify

* update Substrate

* Update .gitlab-ci.yml

* CI: add ubuntu-based image with npm

Co-authored-by: Denis_P's avatarDenis P <denis.pisarev@parity.io>
Co-authored-by: Andronik Ordian's avatarAndronik Ordian <write@reusable.software>
Co-authored-by: thiolliere's avatarthiolliere <gui.thiolliere@gmail.com>
Co-authored-by: parity-processbot <>
parent 6422e672
Pipeline #159042 failed with stages
in 42 minutes and 35 seconds
...@@ -270,7 +270,8 @@ build-adder-collator: ...@@ -270,7 +270,8 @@ build-adder-collator:
#### stage: build #### stage: build
check-transaction-versions: check-transaction-versions:
image: node:15 # image must be ubuntu:20.04 based to match the linkers, this image has npm installed
image: paritytech/contracts-ci-linux:production
stage: build stage: build
<<: *rules-test <<: *rules-test
<<: *docker-env <<: *docker-env
......
This diff is collapsed.
...@@ -4,7 +4,7 @@ error: Generic type parameters may only be used for exactly one field, but is us ...@@ -4,7 +4,7 @@ error: Generic type parameters may only be used for exactly one field, but is us
6 | a: X, 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 --> $DIR/err-01-generic-used-twice.rs:15:17
| |
5 | struct AllSubsystems<X> { 5 | struct AllSubsystems<X> {
......
...@@ -7,7 +7,7 @@ error[E0119]: conflicting implementations of trait `std::convert::From<MsgStrukt ...@@ -7,7 +7,7 @@ error[E0119]: conflicting implementations of trait `std::convert::From<MsgStrukt
| first implementation here | first implementation here
| conflicting implementation for `AllMessages` | 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` error[E0119]: conflicting implementations of trait `polkadot_overseer_gen::SubsystemSender<MsgStrukt>` for type `OverseerSubsystemSender`
--> $DIR/err-01-duplicate-consumer.rs:19:1 --> $DIR/err-01-duplicate-consumer.rs:19:1
...@@ -18,4 +18,4 @@ error[E0119]: conflicting implementations of trait `polkadot_overseer_gen::Subsy ...@@ -18,4 +18,4 @@ error[E0119]: conflicting implementations of trait `polkadot_overseer_gen::Subsy
| first implementation here | first implementation here
| conflicting implementation for `OverseerSubsystemSender` | 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)
...@@ -4,7 +4,7 @@ error: Must declare the overseer error type via `error=..`. ...@@ -4,7 +4,7 @@ error: Must declare the overseer error type via `error=..`.
16 | #[overlord(signal=SigSigSig, event=Event, gen=AllMessages)] 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` error[E0433]: failed to resolve: use of undeclared type `Overseer`
--> $DIR/err-04-missing-error.rs:30:10 --> $DIR/err-04-missing-error.rs:30:10
......
...@@ -39,20 +39,18 @@ pub fn wasm_binary_unwrap() -> &'static [u8] { ...@@ -39,20 +39,18 @@ pub fn wasm_binary_unwrap() -> &'static [u8] {
#[panic_handler] #[panic_handler]
#[no_mangle] #[no_mangle]
pub fn panic(_info: &core::panic::PanicInfo) -> ! { pub fn panic(_info: &core::panic::PanicInfo) -> ! {
unsafe { core::intrinsics::abort() } core::intrinsics::abort()
} }
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
#[alloc_error_handler] #[alloc_error_handler]
#[no_mangle] #[no_mangle]
pub fn oom(_: core::alloc::Layout) -> ! { pub fn oom(_: core::alloc::Layout) -> ! {
unsafe { core::intrinsics::abort();
core::intrinsics::abort();
}
} }
#[cfg(not(feature = "std"))] #[cfg(not(feature = "std"))]
#[no_mangle] #[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 {} loop {}
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment