Skip to content

Commit

Permalink
Update parity-scale-codec to prepare for breaking rustc release (#6746)
Browse files Browse the repository at this point in the history
This updates parity-scale-codec{-derive} to prepare for a rustc release
that would otherwise break the derive implementation:
rust-lang/rust#73084
  • Loading branch information
bkchr authored Jul 28, 2020
1 parent 66a47d2 commit a37bb5f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
pallet-balances = { version = "2.0.0-rc5", default-features = false, path = "../balances" }
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive"] }
sp-std = { version = "2.0.0-rc5", default-features = false, path = "../../primitives/std" }
serde = { version = "1.0.101", optional = true }
sp-runtime = { version = "2.0.0-rc5", default-features = false, path = "../../primitives/runtime" }
Expand Down
4 changes: 2 additions & 2 deletions benchmarking/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ description = "FRAME offences pallet benchmarking"
targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false }
frame-benchmarking = { version = "2.0.0-rc5", default-features = false, path = "../../benchmarking" }
frame-support = { version = "2.0.0-rc5", default-features = false, path = "../../support" }
frame-system = { version = "2.0.0-rc5", default-features = false, path = "../../system" }
Expand All @@ -28,7 +28,6 @@ sp-staking = { version = "2.0.0-rc5", default-features = false, path = "../../..
sp-std = { version = "2.0.0-rc5", default-features = false, path = "../../../primitives/std" }

[dev-dependencies]
codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
pallet-staking-reward-curve = { version = "2.0.0-rc5", path = "../../staking/reward-curve" }
pallet-timestamp = { version = "2.0.0-rc5", path = "../../timestamp" }
serde = { version = "1.0.101" }
Expand All @@ -51,4 +50,5 @@ std = [
"sp-runtime/std",
"sp-staking/std",
"sp-std/std",
"codec/std",
]

0 comments on commit a37bb5f

Please sign in to comment.