Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update RLS and Rustfmt #56061

Closed
wants to merge 1 commit into from
Closed

Update RLS and Rustfmt #56061

wants to merge 1 commit into from

Conversation

nrc
Copy link
Member

@nrc nrc commented Nov 19, 2018

@nrc nrc force-pushed the update branch 2 times, most recently from 1efc1de to 1c89187 Compare November 19, 2018 04:23
@Dylan-DPC-zz Dylan-DPC-zz added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 19, 2018
@kennytm
Copy link
Member

kennytm commented Nov 19, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Nov 19, 2018

📌 Commit 1c891877fe393e6e7251c2e09bd2fa7de9ff7517 has been approved by kennytm

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 19, 2018
@kennytm
Copy link
Member

kennytm commented Nov 19, 2018

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 19, 2018

📌 Commit 1c891877fe393e6e7251c2e09bd2fa7de9ff7517 has been approved by kennytm

@nrc nrc added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 19, 2018
@alexcrichton alexcrichton modified the milestones: 1.31, Rust 2018 Release Nov 19, 2018
@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 19, 2018
@bors
Copy link
Contributor

bors commented Nov 20, 2018

🔒 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.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 20, 2018
@nrc
Copy link
Member Author

nrc commented Nov 20, 2018

@bors r=kennytm p=2

@bors
Copy link
Contributor

bors commented Nov 20, 2018

📌 Commit 6a189b2 has been approved by kennytm

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 20, 2018
@bors
Copy link
Contributor

bors commented Nov 20, 2018

⌛ Testing commit 6a189b2 with merge a11620b...

bors added a commit that referenced this pull request Nov 20, 2018
@bors
Copy link
Contributor

bors commented Nov 20, 2018

💔 Test failed - status-appveyor

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 20, 2018
@kennytm
Copy link
Member

kennytm commented Nov 20, 2018

`\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

@kennytm kennytm added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 20, 2018
@nikomatsakis nikomatsakis mentioned this pull request Nov 20, 2018
20 tasks
@nrc nrc closed this Nov 20, 2018
@nrc nrc deleted the update branch November 20, 2018 19:24
@nrc nrc mentioned this pull request Nov 20, 2018
bors added a commit that referenced this pull request Nov 20, 2018
Update RLS and Rustfmt

Re-opening #56061

@bors: r=kennytm p=2
@pietroalbini pietroalbini removed beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Nov 20, 2018
bors added a commit that referenced this pull request Nov 20, 2018
beta backport rollup

Backports of some beta-approved PRs

- [x] #55385: NLL: cast causes failure to promote to static
- [x] #56043: remove "approx env bounds" if we already know from trait
- [x] #56003: do not propagate inferred bounds on trait objects if they involve `Self`
- [x] #55852: Rewrite `...` as `..=` as a `MachineApplicable` 2018 idiom lint
- [x] #55804: rustdoc: don't inline `pub use some_crate` unless directly asked to
- [x] #56059: Increase `Duration` approximate equal threshold to 1us
- [x]  Keep resolved defs in path prefixes and emit them in save-analysis #54145
- [x]  Adjust Ids of path segments in visibility modifiers #55487
- [x]  save-analysis: bug fix and optimisation. #55521
- [x]   save-analysis: be even more aggressive about ignorning macro-generated defs #55936
- [x]  save-analysis: fallback to using path id #56060
- [x]  save-analysis: Don't panic for macro-generated use globs #55879
- [x]  Add temporary renames to manifests for rustfmt/clippy #56081
- [x] Revert #51601 #56049
- [x]  Fix stability hole with `static _` #55983
- [x] #56077
- [x] Fix Rustdoc ICE when checking blanket impls #55258
- [x]  Updated RELEASES.md for 1.31.0 #55678
- [x] ~~#56061~~ #56111
- [x]  Stabilize `extern_crate_item_prelude` #56032

Still running tests locally, and I plan to backport @nrc's other PRs too

(cc @petrochenkov -- thanks for the advice)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants