Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update dependencies
Browse files Browse the repository at this point in the history
* cargo -> 545f354
* clippy -> 20da8f4
* cargo_metadata -> 0.8
* jsonrpc-core -> 11
* lsp-types -> 0.57.2
* rustc_tools_util -> 0.2
* cargo update
alexheretic committed Jun 3, 2019
1 parent 9692ca8 commit 50e040b
Showing 4 changed files with 622 additions and 556 deletions.
1,160 changes: 613 additions & 547 deletions Cargo.lock

Large diffs are not rendered by default.

15 changes: 7 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -28,23 +28,22 @@ rls-data = "0.19"
rls-rustc = { version = "0.6.0", path = "rls-rustc" }
rls-span = "0.5"
rls-vfs = "0.8"

cargo = { git = "https://github.com/rust-lang/cargo", rev = "d56af31df1fbe45105ccd3b633297b2bc61e7405" }
cargo_metadata = "0.7"
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "60a609acaed3bf2b3ec6ab995bccf0f03bc26060", optional = true }
cargo = { git = "https://github.com/rust-lang/cargo", rev = "545f354259be4e9745ea00a524c0e4c51df01aa6" }
cargo_metadata = "0.8"
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "20da8f45c601d0eec8af8c0897abd536ad57951f", optional = true }
env_logger = "0.6"
failure = "0.1.1"
home = "0.3"
itertools = "0.8"
jsonrpc-core = "10"
lsp-types = { version = "0.57", features = ["proposed"] }
jsonrpc-core = "11"
lsp-types = { version = "=0.57.2", features = ["proposed"] }
lazy_static = "1"
log = "0.4"
num_cpus = "1"
racer = { version = "2.1.22", default-features = false }
rand = "0.6"
rayon = "1"
rustc_tools_util = "0.1.1"
rustc_tools_util = "0.2"
rustfmt-nightly = "1.2"
rustc-serialize = "0.3"
serde = "1.0"
@@ -74,7 +73,7 @@ tokio-process = "0.2"
tokio-timer = "0.2"

[build-dependencies]
rustc_tools_util = "0.1.1"
rustc_tools_util = "0.2"

[features]
default = ["clippy"]
1 change: 1 addition & 0 deletions rls/src/server/mod.rs
Original file line number Diff line number Diff line change
@@ -433,6 +433,7 @@ fn server_caps(ctx: &ActionContext) -> ServerCapabilities {

folding_range_provider: None,
workspace: None,
selection_range_provider: None,
}
}

2 changes: 1 addition & 1 deletion tests/support/client/mod.rs
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ mod child_process;
// however we only call `Runtime::block_on` and whenever we do it, there are no
// active borrows in scope.
type Messages = Rc<RefCell<Vec<Value>>>;
type Channels = Rc<RefCell<Vec<(Box<Fn(&Value) -> bool>, oneshot::Sender<Value>)>>>;
type Channels = Rc<RefCell<Vec<(Box<dyn Fn(&Value) -> bool>, oneshot::Sender<Value>)>>>;

type LspFramed<T> = tokio::codec::Framed<T, LspCodec>;

0 comments on commit 50e040b

Please sign in to comment.