Auto merge of #47051 - Xanewok:update-rls, r=kennytm

Update RLS and Rustfmt Essentially #46929 with only RLS update that fixes the build. The rls wasn't included in the recent nightlies and a lot of people have been wondering what to do about it, so it'd be good to include the RLS back with the nightly builds as soon as we can. r? @alexcrichton
rust-lang · Dec 29, 2017 · f0e5c95 · f0e5c95
2 parents 966fdf1 + 5081b94
commit f0e5c95
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 59 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/tools/rls b/src/tools/rls
diff --git a/src/tools/rustfmt b/src/tools/rustfmt