Skip to content

Commit

Permalink
Rollup merge of rust-lang#62176 - Xanewok:update-rls, r=alexcrichton
Browse files Browse the repository at this point in the history
Update RLS

Merged PRs:
* fix(cmd): make clear_env_rust_log default to false (rust-lang/rls#1486)
  - Retain `RUST_LOG` in `rls --cli` mode
* Pass --file-lines to rustfmt only if specified (rust-lang/rls#1497)
  - Fix entire-file formatting when using external rustfmt (specified via `rustfmt_path` config)
* Ensure that --error-format is only passed once to `rustc` (rust-lang/rls#1500)
  - Unbreaks RLS when used together with Cargo [pipelining build](rust-lang#60988) feature (@alexcrichton I'd consider this a stabilization blocker, mind adding it to the tracking issue for the record? 🙇‍♂️ )
  • Loading branch information
Centril authored Jun 27, 2019
2 parents d6fd059 + d79104b commit 65f1ff4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 3e5196 to 597c9b

0 comments on commit 65f1ff4

Please sign in to comment.