From 572e42eef42e433810956a5805bdd19d0007fb24 Mon Sep 17 00:00:00 2001 From: "Evgeniy A. Dushistov" Date: Sat, 8 Aug 2020 00:10:16 +0300 Subject: [PATCH] remove tokio-tungstenite from patch sections the current release of tokio-tungstenite contains all suitable fixes add notes about https://github.com/hyperium/http/pull/422 https://github.com/alexcrichton/cmake-rs/issues/96 https://github.com/alexcrichton/cmake-rs/pull/101 --- Cargo.toml | 4 +++- couchbase-lite/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 895326e..dc3c1ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,8 +2,10 @@ members = ["couchbase-lite-core-sys", "couchbase-lite", "chat-demo"] [patch.'crates-io'] +# waiting https://github.com/hyperium/http/pull/422 http = { git = "https://github.com/Dushistov/http", rev = "3ad3b825edc3a0d9048a6af5ab524f2fc51bde30" } -tokio-tungstenite = { git = "https://github.com/snapview/tokio-tungstenite", rev = "dff4d7209b5f8c4299a2e2be9f46bd79217fda48" } couchbase-lite = { path = "couchbase-lite" } couchbase-lite-core-sys = { path = "couchbase-lite-core-sys" } +# waiting https://github.com/alexcrichton/cmake-rs/issues/96 +# and https://github.com/alexcrichton/cmake-rs/pull/101 cmake = { git = "https://github.com/Dushistov/cmake-rs", rev = "125fe65e123f9bd4ceaf91924b0a381d473f2d97" } \ No newline at end of file diff --git a/couchbase-lite/Cargo.toml b/couchbase-lite/Cargo.toml index bc08696..e5d53d3 100644 --- a/couchbase-lite/Cargo.toml +++ b/couchbase-lite/Cargo.toml @@ -19,7 +19,7 @@ fallible-streaming-iterator = "0.1.9" bitflags = "1.2.1" once_cell = "1.2.0" log = "0.4.8" -tokio-tungstenite = { version = "0.10.1", optional = true } +tokio-tungstenite = { version = "0.11.0", optional = true } http = { version = "0.2.1", optional = true } tokio = { version = "0.2", default-features = false, features = ["sync", "macros"], optional = true } futures-util = { version = "0.3.5", optional = true }