Skip to content

Commit

Permalink
Auto merge of rust-lang#49285 - nrc:update, r=alexcrichton
Browse files Browse the repository at this point in the history
Update RLS and Rustfmt

Fixes broken RLS tests/build

r? @alexcrichton
  • Loading branch information
bors committed Mar 23, 2018
2 parents 52f7e88 + aa238a3 commit 55e1104
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
23 changes: 22 additions & 1 deletion src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 567fb6 to 974c51
2 changes: 1 addition & 1 deletion src/tools/rustfmt

0 comments on commit 55e1104

Please sign in to comment.