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

Commit 65e83bb

Browse files
committed
Merge remote-tracking branch 'origin/master' into target-backup-exclusion
2 parents 921056e + 942aa2b commit 65e83bb

File tree

3 files changed

+55
-53
lines changed

3 files changed

+55
-53
lines changed

Cargo.lock

Lines changed: 48 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ name = "rls"
2020
test = false
2121
path = "rls/src/main.rs"
2222

23+
[patch.crates-io]
24+
rustfmt-nightly = { version = "1.4.20", git = "https://github.com/rust-lang/rustfmt", branch = "rustfmt-1.4.20" }
25+
2326
[dependencies]
2427
rls-analysis = "0.18.0"
2528
rls-data = "0.19"
@@ -30,7 +33,7 @@ rls-vfs = "0.8"
3033
rls-ipc = { version = "0.1.0", path = "rls-ipc", optional = true }
3134

3235
anyhow = "1.0.26"
33-
cargo = { git = "https://github.com/rust-lang/cargo", rev = "f35ebafc74fed12ba7c5f7c497a7e751889c11dd" }
36+
cargo = { git = "https://github.com/rust-lang/cargo", rev = "43cf77395cad5b79887b20b7cf19d418bbd703a9" }
3437
cargo_metadata = "0.8"
3538
clippy_lints = { git = "https://github.com/rust-lang/rust-clippy", rev = "7ea7cd165ad6705603852771bf82cc2fd6560db5", optional = true }
3639
env_logger = "0.7"
@@ -42,11 +45,11 @@ lsp-types = { version = "0.60", features = ["proposed"] }
4245
lazy_static = "1"
4346
log = "0.4"
4447
num_cpus = "1"
45-
racer = { version = "2.1.35", default-features = false }
48+
racer = { version = "2.1.37", default-features = false }
4649
rand = "0.7"
4750
rayon = "1"
4851
rustc_tools_util = "0.2"
49-
rustfmt-nightly = "1.4.16"
52+
rustfmt-nightly = "1.4.20"
5053
serde = "1.0"
5154
serde_json = "1.0"
5255
serde_derive = "1.0"

ci/azure-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
parameters:
1818
rust_version: ${{ parameters.rust }}
1919
- script: |
20-
rustup component add rust-src rust-analysis rustc-dev
20+
rustup component add rust-src rust-analysis rustc-dev llvm-tools-preview
2121
displayName: Install distributed Rust source code for Racer autocompletion
2222
- ${{ each crate in parameters.crates }}:
2323
- script: cargo test -v

0 commit comments

Comments
 (0)