Update RLS and Rustfmt

[nrc]

r? @kennytm

[kennytm]

@bors r+

[bors]

📌 Commit 1c891877fe393e6e7251c2e09bd2fa7de9ff7517 has been approved by kennytm

[kennytm]

@bors r+ p=1

[bors]

📌 Commit 1c891877fe393e6e7251c2e09bd2fa7de9ff7517 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 (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 --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.

[nrc]

@bors r=kennytm p=2

[bors]

📌 Commit 6a189b2 has been approved by kennytm

[bors]

⌛ Testing commit 6a189b2 with merge a11620b...

[bors]

💔 Test failed - status-appveyor

[kennytm]

`\r\n` vs `\n` problem in the 😢😢😢😢😢😢😢 test

---- cmd_format_utf16_range stdout ----
Object(
    {
        "id": Number(
            66
        ),
        "jsonrpc": String(
            "2.0"
        ),
        "result": Array(
            [
                Object(
                    {
                        "newText": String(
                            "/* 😢😢😢😢😢😢😢 */\r\nfn main() {}\r\n"
                        ),
                        "range": Object(
                            {
                                "end": Object(
                                    {
                                        "character": Number(
                                            34
                                        ),
                                        "line": Number(
                                            0
                                        )
                                    }
                                ),
                                "start": Object(
                                    {
                                        "character": Number(
                                            0
                                        ),
                                        "line": Number(
                                            0
                                        )
                                    }
                                )
                            }
                        )
                    }
                )
            ]
        )
    }
)
thread 'cmd_format_utf16_range' panicked at 'assertion failed: `(left == right)`
  left: `["/* 😢😢😢😢😢😢😢 */\r\nfn main() {}\r\n"]`,
 right: `["/* 😢😢😢😢😢😢😢 */\nfn main() {}\n"]`', tools\rls\tests\tests.rs:1306:5
note: Run with `RUST_BACKTRACE=1` for a backtrace.
---rls-stdout---
Content-Length: 605
{"jsonrpc":"2.0","id":0,"result":{"capabilities":{"textDocumentSync":2,"hoverProvider":true,"completionProvider":{"resolveProvider":true,"triggerCharacters":[".",":"]},"definitionProvider":true,"implementationProvider":true,"referencesProvider":true,"documentHighlightProvider":true,"documentSymbolProvider":true,"workspaceSymbolProvider":true,"codeActionProvider":true,"codeLensProvider":{"resolveProvider":false},"documentFormattingProvider":true,"documentRangeFormattingProvider":false,"renameProvider":true,"executeCommandProvider":{"commands":["rls.applySuggestion-1616","rls.deglobImports-1616"]}}}}Content-Length: 92
{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","title":"Building"}}Content-Length: 127
{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","message":"cmd_format_utf16_range","title":"Building"}}Content-Length: 137
{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_1","message":"cmd_format_utf16_range cfg(test)","title":"Building"}}Content-Length: 104
{"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_1","title":"Building"}}Content-Length: 92
{"jsonrpc":"2.0","method":"window/progress","params":{"id":"progress_0","title":"Indexing"}}Content-Length: 104
{"jsonrpc":"2.0","method":"window/progress","params":{"done":true,"id":"progress_0","title":"Indexing"}}Content-Length: 180
{"jsonrpc":"2.0","id":66,"result":[{"range":{"start":{"line":0,"character":0},"end":{"line":0,"character":34}},"newText":"/* 😢😢😢😢😢😢😢 */\r\nfn main() {}\r\n"}]}
---------------
failures:
    cmd_format_utf16_range
test result: FAILED. 12 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out