diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2017-11-21 15:42:22 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2017-11-29 19:15:46 +1300 |
| commit | 1b50f68135e98a4c48fd4c02bc553c8022c72827 (patch) | |
| tree | 343e5e016ccd64604f115d8f523a4ef89cd4e44b | |
| parent | 77ab3a1d5ff69c0cb3eb85a75ef734eaf7429f1b (diff) | |
| download | rust-1b50f68135e98a4c48fd4c02bc553c8022c72827.tar.gz rust-1b50f68135e98a4c48fd4c02bc553c8022c72827.zip | |
Update RLS and Rustfmt
| -rw-r--r-- | src/Cargo.toml | 9 | ||||
| m--------- | src/tools/rls | 0 | ||||
| m--------- | src/tools/rustfmt | 28 |
3 files changed, 19 insertions, 18 deletions
diff --git a/src/Cargo.toml b/src/Cargo.toml index 39904927ca6..abe1fe5a6de 100644 --- a/src/Cargo.toml +++ b/src/Cargo.toml @@ -21,18 +21,19 @@ members = [ "tools/rls", "tools/rustfmt", # FIXME(https://github.com/rust-lang/cargo/issues/4089): move these to exclude + "tools/rls/test_data/bin_lib", "tools/rls/test_data/borrow_error", "tools/rls/test_data/common", + "tools/rls/test_data/deglob", "tools/rls/test_data/features", "tools/rls/test_data/find_all_refs_no_cfg_test", - "tools/rls/test_data/reformat", - "tools/rls/test_data/multiple_bins", - "tools/rls/test_data/bin_lib", - "tools/rls/test_data/reformat_with_range", "tools/rls/test_data/find_impls", "tools/rls/test_data/infer_bin", "tools/rls/test_data/infer_custom_bin", "tools/rls/test_data/infer_lib", + "tools/rls/test_data/multiple_bins", + "tools/rls/test_data/reformat", + "tools/rls/test_data/reformat_with_range", "tools/rls/test_data/workspace_symbol", ] diff --git a/src/tools/rls b/src/tools/rls -Subproject 015073b7c8a192584c15b2c1bd34a92025cf683 +Subproject 194f8286f12701de80c95a457723a33ccad014e diff --git a/src/tools/rustfmt b/src/tools/rustfmt -Subproject 291dbe8d87701f3617ccdd70caa49df1c27af0e +Subproject 2bfcadf8de0c587c04a0bf16a303c76cbef95fa |