Update RLS and Rustfmt

[Xanewok]

RLS

• Allow project model to download crates (#1020)
• Support simple external builds (#988)
• Support using external Rustfmt (#990)

Rustfmt (0.99.4)

• Format chains with comment (#2899)
• Do not show wildcard pattern in slice pattern (#2912)
• Impl only use (#2951)
• ... and more

Bumped in tandem to pull a single version of rustc-ap-* libs.

r? @nrc

[rust-highfive]

⚠️ Warning ⚠️

• These commits modify submodules.

[kennytm]

@bors r+ p=5

[bors]

📌 Commit c6f7040268589155c9f30a5550114de49cad5649 has been approved by kennytm

[bors]

⌛ Testing commit c6f7040268589155c9f30a5550114de49cad5649 with merge 59f30b9929998279d024c25e1fbea18659fb1ae6...

[bors]

💔 Test failed - status-appveyor

[kennytm]

[01:02:21] error[E0061]: this function takes 5 parameters but 4 parameters were supplied
[01:02:21]    --> tools\rls\src\build\rustc.rs:185:12
[01:02:21]     |
[01:02:21] 185 |         ls.register_group(Some(sess), true, name, to);
[01:02:21]     |            ^^^^^^^^^^^^^^ expected 5 parameters

[flip1995]

See #53762

rust/src/librustc_driver/driver.rs

Lines 927 to 929 in fea32f1

	for (name, (to, deprecated_name)) in lint_groups {
	ls.register_group(Some(sess), true, name, deprecated_name, to);
	}

EDIT: oops already done on rls master

[Xanewok]

Rebased and checked locally, should work with recent Clippy bump.

r? @kennytm

[kennytm]

@bors r+ p=5

[bors]

📌 Commit 5de69e2f5f1f244ecb35f357754042b97bca29f7 has been approved by kennytm

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout update-rls (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self update-rls --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: src/Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/Cargo.lock
CONFLICT (content): Merge conflict in src/Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[Xanewok]

r? @kennytm, @oli-obk or @nrc

It seems that rustc doesn't like the not separated -Aclippy::all tool lint form (didn't compile crates with that, seems like a bug? cc @flip1995)

Hopefully RLS survives a couple of hours and makes it into nightlies 😄

EDIT: Rephrased the tool lint bit to clarify.

[oli-obk]

@bors r+

doesn't like not separated -Aclippy::all tool lint names

I think you mean it wants it separated, and doesn't like it without a space inbetween?

[bors]

📌 Commit d5e5e76 has been approved by oli-obk

[Xanewok]

doesn't like it not separated -Aclippy::all tool lint names

Oops, I accidentally a word there, sorry!
Yeah, it likes them separated; it seems it doesn't work when using the -Aclippy::all form.

[bors]

⌛ Testing commit d5e5e76 with merge 1c2e17f...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 1c2e17f to master...

[rust-highfive]

📣 Toolstate changed by #53870!

Tested on commit 1c2e17f.
Direct link to PR: #53870

🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.