Use crates.io version for jsonrpc-* crates

rust-lang · Aug 24, 2021 · 674b272 · 674b272
1 parent d5cdd8a
commit 674b272
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,13 +20,6 @@ name = "rls"
 test = false
 path = "rls/src/main.rs"
 
-[patch.crates-io]
-parity-tokio-ipc = { git = "https://github.com/Xanewok/parity-tokio-ipc", branch = "mio-07" }
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", branch = "igor-tokio-1.0" }
-jsonrpc-core-client = { git = "https://github.com/paritytech/jsonrpc", branch = "igor-tokio-1.0" }
-jsonrpc-derive = { git = "https://github.com/paritytech/jsonrpc", branch = "igor-tokio-1.0" }
-jsonrpc-ipc-server = { git = "https://github.com/paritytech/jsonrpc", branch = "igor-tokio-1.0" }
-
 [dependencies]
 # FIXME: Release rls-analysis 0.18.2 to crates.io
 rls-analysis = { version = "0.18.2", path = "rls-analysis" }
@@ -45,7 +38,7 @@ clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "a55912
 env_logger = "0.7"
 home = "0.5.1"
 itertools = "0.9"
-jsonrpc-core = "17"
+jsonrpc-core = "18"
 lsp-types = { version = "0.60", features = ["proposed"] }
 lazy_static = "1"
 log = "0.4"

diff --git a/rls-ipc/Cargo.toml b/rls-ipc/Cargo.toml
@@ -9,10 +9,10 @@ repository = "https://github.com/rust-lang/rls"
 categories = ["development-tools"]
 
 [dependencies]
-jsonrpc-core = "17"
-jsonrpc-core-client = "17"
-jsonrpc-derive = "17"
-jsonrpc-ipc-server = { version = "17", optional = true }
+jsonrpc-core = "18"
+jsonrpc-core-client = "18"
+jsonrpc-derive = "18"
+jsonrpc-ipc-server = { version = "18", optional = true }
 rls-data = "0.19"
 serde = { version = "1.0", features = ["derive"] }