diff options
| author | bors <bors@rust-lang.org> | 2019-07-30 16:59:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-07-30 16:59:09 +0000 |
| commit | dddb7fca09dc817ba275602b950bb81a9032fb6d (patch) | |
| tree | 8e8b1ecdcd3c5ccf9ef0e3d632c0f9d6eb936dae /src | |
| parent | f690098e6d65ad7b33dc7fdefccc387806782027 (diff) | |
| parent | 1b61db706a3e16493b18de5ce9c70fc8335d72e2 (diff) | |
| download | rust-dddb7fca09dc817ba275602b950bb81a9032fb6d.tar.gz rust-dddb7fca09dc817ba275602b950bb81a9032fb6d.zip | |
Auto merge of #62805 - Xanewok:update-rls, r=Xanewok
Update RLS and Rustfmt Supersedes https://github.com/rust-lang/rust/pull/62537. Closes #62803. Fixes fallout after https://github.com/rust-lang/rust/pull/62679. r? @ghost
Diffstat (limited to 'src')
| m--------- | src/tools/rls | 0 | ||||
| -rw-r--r-- | src/tools/rustc-workspace-hack/Cargo.toml | 1 | ||||
| m--------- | src/tools/rustfmt | 22 |
3 files changed, 6 insertions, 17 deletions
diff --git a/src/tools/rls b/src/tools/rls -Subproject 124483dd2f10fe3ba32f7f5b75f32224c77f901 +Subproject 70347b5d4dfe78eeb9e6f6db85f773c8d43cd22 diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml index 26b447d2efe..4ce411223de 100644 --- a/src/tools/rustc-workspace-hack/Cargo.toml +++ b/src/tools/rustc-workspace-hack/Cargo.toml @@ -64,6 +64,7 @@ features = [ [dependencies] curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true } +crossbeam-utils = { version = "0.6.5", features = ["nightly"] } parking_lot = { version = "0.7", features = ['nightly'] } rand = { version = "0.6.1", features = ["i128_support"] } serde = { version = "1.0.82", features = ['derive'] } diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject 66c27c9161b2aa70c2902807be12952bd4a0a62 +Subproject 9e960e7d6a0c6b7c46c195acbd6f92ade6eec3b |