Skip to content

Commit

Permalink
Include bitvec in std for Broker Pallet (paritytech#1558)
Browse files Browse the repository at this point in the history
When adding this pallet to the [Coretime
Chain](paritytech#1479), this
dependency results in conflicting implementations (rustc error below).
This toml change fixes it.

```
error: failed to run custom build command for `coretime-rococo-runtime v1.0.0 (/home/joe/parity/polkadot-sdk/cumulus/parachains/runtimes/coretime/coretime-rococo)`

Caused by:
  process didn't exit successfully: `/home/joe/parity/polkadot-sdk/target/debug/build/coretime-rococo-runtime-7943703d2770a119/build-script-build` (exit status: 1)
  --- stdout
  Information that should be included in a bug report.
  Executing build command: RUSTFLAGS="-C target-cpu=mvp -C target-feature=-sign-ext -C link-arg=--export-table -Clink-arg=--export=__heap_base -C link-arg=--import-memory  " SKIP_WASM_BUILD="" "/home/joe/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin/cargo" "rustc" "--target=wasm32-unknown-unknown" "--manifest-path=/home/joe/parity/polkadot-sdk/target/debug/wbuild/coretime-rococo-runtime/Cargo.toml" "--color=always" "--profile" "release"
  Using rustc version: rustc 1.71.1 (eb26296b5 2023-08-03)


  --- stderr
     Compiling sp-io v23.0.0 (/home/joe/parity/polkadot-sdk/substrate/primitives/io)
     Compiling coretime-rococo-runtime v1.0.0 (/home/joe/parity/polkadot-sdk/cumulus/parachains/runtimes/coretime/coretime-rococo)
  error[E0152]: found duplicate lang item `panic_impl`
      --> /home/joe/parity/polkadot-sdk/substrate/primitives/io/src/lib.rs:1749:1
       |
  1749 | pub fn panic(info: &core::panic::PanicInfo) -> ! {
       | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
       |
       = note: the lang item is first defined in crate `std` (which `bitvec` depends on)
       = note: first definition in `std` loaded from /home/joe/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/wasm32-unknown-unknown/lib/libstd-67dfbacfb4b441ef.rlib
       = note: second definition in the local crate (`sp_io`)

  For more information about this error, try `rustc --explain E0152`.
```
  • Loading branch information
joepetrowski authored Sep 16, 2023
1 parent ffa0298 commit 5e5651e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion substrate/frame/broker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [ "derive"] }
scale-info = { version = "2.0.0", default-features = false, features = ["derive"] }
bitvec = "1"
bitvec = { version = "1.0.0", default-features = false }
sp-std = { path = "../../primitives/std", default-features = false}
sp-arithmetic = { path = "../../primitives/arithmetic", default-features = false}
sp-core = { path = "../../primitives/core", default-features = false}
Expand All @@ -30,6 +30,7 @@ sp-io = { path = "../../primitives/io" }
default = [ "std" ]

std = [
"bitvec/std",
"codec/std",
"frame-benchmarking?/std",
"frame-support/std",
Expand Down
2 changes: 1 addition & 1 deletion substrate/frame/broker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Brokerage tool for managing Polkadot Core scheduling.

Properly described in RFC-0001 Agile Coretime.

## Implemnentation Specifics
## Implementation Specifics

### Core Mask Bits

Expand Down

0 comments on commit 5e5651e

Please sign in to comment.