Skip to content
Snippets Groups Projects
Commit 544950cc authored by Éloïs's avatar Éloïs
Browse files

patch rw-stream-sink to force the use of pin-project v1.x

parent bc9f1b6a
No related branches found
No related tags found
1 merge request!9upgrade substrate to monthly-2022-01
...@@ -2744,7 +2744,7 @@ dependencies = [ ...@@ -2744,7 +2744,7 @@ dependencies = [
"http", "http",
"jsonrpsee-core", "jsonrpsee-core",
"jsonrpsee-types", "jsonrpsee-types",
"pin-project 1.0.8", "pin-project",
"rustls-native-certs 0.6.1", "rustls-native-certs 0.6.1",
"soketto", "soketto",
"thiserror", "thiserror",
...@@ -3047,7 +3047,7 @@ dependencies = [ ...@@ -3047,7 +3047,7 @@ dependencies = [
"libp2p-yamux", "libp2p-yamux",
"multiaddr", "multiaddr",
"parking_lot", "parking_lot",
"pin-project 1.0.8", "pin-project",
"smallvec", "smallvec",
"wasm-timer", "wasm-timer",
] ]
...@@ -3072,7 +3072,7 @@ dependencies = [ ...@@ -3072,7 +3072,7 @@ dependencies = [
"multihash 0.14.0", "multihash 0.14.0",
"multistream-select", "multistream-select",
"parking_lot", "parking_lot",
"pin-project 1.0.8", "pin-project",
"prost", "prost",
"prost-build", "prost-build",
"rand 0.8.4", "rand 0.8.4",
...@@ -3313,7 +3313,7 @@ checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" ...@@ -3313,7 +3313,7 @@ checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c"
dependencies = [ dependencies = [
"futures 0.3.16", "futures 0.3.16",
"log", "log",
"pin-project 1.0.8", "pin-project",
"rand 0.7.3", "rand 0.7.3",
"salsa20", "salsa20",
"sha3", "sha3",
...@@ -3332,7 +3332,7 @@ dependencies = [ ...@@ -3332,7 +3332,7 @@ dependencies = [
"libp2p-core", "libp2p-core",
"libp2p-swarm", "libp2p-swarm",
"log", "log",
"pin-project 1.0.8", "pin-project",
"prost", "prost",
"prost-build", "prost-build",
"rand 0.7.3", "rand 0.7.3",
...@@ -3927,7 +3927,7 @@ dependencies = [ ...@@ -3927,7 +3927,7 @@ dependencies = [
"bytes 1.1.0", "bytes 1.1.0",
"futures 0.3.16", "futures 0.3.16",
"log", "log",
"pin-project 1.0.8", "pin-project",
"smallvec", "smallvec",
"unsigned-varint 0.7.0", "unsigned-varint 0.7.0",
] ]
...@@ -4698,33 +4698,13 @@ dependencies = [ ...@@ -4698,33 +4698,13 @@ dependencies = [
"indexmap", "indexmap",
] ]
[[package]]
name = "pin-project"
version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f"
dependencies = [
"pin-project-internal 0.4.28",
]
[[package]] [[package]]
name = "pin-project" name = "pin-project"
version = "1.0.8" version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08"
dependencies = [ dependencies = [
"pin-project-internal 1.0.8", "pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
dependencies = [
"proc-macro2",
"quote",
"syn",
] ]
[[package]] [[package]]
...@@ -5418,11 +5398,10 @@ dependencies = [ ...@@ -5418,11 +5398,10 @@ dependencies = [
[[package]] [[package]]
name = "rw-stream-sink" name = "rw-stream-sink"
version = "0.2.1" version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/librelois/rw-stream-sink?branch=master#7a5614fa27964c082faeb67749f5c892a16317cd"
checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020"
dependencies = [ dependencies = [
"futures 0.3.16", "futures 0.3.16",
"pin-project 0.4.28", "pin-project",
"static_assertions", "static_assertions",
] ]
...@@ -5971,7 +5950,7 @@ dependencies = [ ...@@ -5971,7 +5950,7 @@ dependencies = [
"lru 0.7.2", "lru 0.7.2",
"parity-scale-codec", "parity-scale-codec",
"parking_lot", "parking_lot",
"pin-project 1.0.8", "pin-project",
"prost", "prost",
"prost-build", "prost-build",
"rand 0.7.3", "rand 0.7.3",
...@@ -6152,7 +6131,7 @@ dependencies = [ ...@@ -6152,7 +6131,7 @@ dependencies = [
"parity-scale-codec", "parity-scale-codec",
"parity-util-mem", "parity-util-mem",
"parking_lot", "parking_lot",
"pin-project 1.0.8", "pin-project",
"rand 0.7.3", "rand 0.7.3",
"sc-block-builder", "sc-block-builder",
"sc-chain-spec", "sc-chain-spec",
...@@ -6223,7 +6202,7 @@ dependencies = [ ...@@ -6223,7 +6202,7 @@ dependencies = [
"libp2p", "libp2p",
"log", "log",
"parking_lot", "parking_lot",
"pin-project 1.0.8", "pin-project",
"rand 0.7.3", "rand 0.7.3",
"serde", "serde",
"serde_json", "serde_json",
...@@ -7900,7 +7879,7 @@ version = "0.2.5" ...@@ -7900,7 +7879,7 @@ version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
dependencies = [ dependencies = [
"pin-project 1.0.8", "pin-project",
"tracing", "tracing",
] ]
...@@ -8031,7 +8010,7 @@ version = "1.6.1" ...@@ -8031,7 +8010,7 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e" checksum = "1f559b464de2e2bdabcac6a210d12e9b5a5973c251e102c44c585c71d51bd78e"
dependencies = [ dependencies = [
"cfg-if 1.0.0", "cfg-if 0.1.10",
"rand 0.8.4", "rand 0.8.4",
"static_assertions", "static_assertions",
] ]
......
...@@ -73,3 +73,8 @@ zeroize = { opt-level = 3 } ...@@ -73,3 +73,8 @@ zeroize = { opt-level = 3 }
[profile.release] [profile.release]
# Substrate runtime requires unwinding. # Substrate runtime requires unwinding.
panic = "unwind" panic = "unwind"
[patch.crates-io]
# rw-stream-sink has not been updated for 2 years and uses a too old version of pin-project (v0.4.28)
# For the project to compile, we have to patch this dependency to force the use of pin-project v1.x
rw-stream-sink = { git = "https://github.com/librelois/rw-stream-sink", branch = "master" }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment