Skip to content

Update RLS and Rustfmt #46144

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 4 commits into from
Nov 30, 2017
Merged

Update RLS and Rustfmt #46144

merged 4 commits into from
Nov 30, 2017

Conversation

nrc
Copy link
Member

@nrc nrc commented Nov 21, 2017

@kennytm kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Nov 21, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Nov 21, 2017

📌 Commit 4bf1cc3 has been approved by alexcrichton

@alexcrichton alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Nov 21, 2017
@nrc
Copy link
Member Author

nrc commented Nov 22, 2017

@bors: r- (I have a test fix to update this with)

@nrc nrc removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 22, 2017
@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 22, 2017
@nrc nrc force-pushed the rls-update branch 3 times, most recently from 1c0d89a to 4b0e75e Compare November 22, 2017 23:28
@nrc
Copy link
Member Author

nrc commented Nov 22, 2017

@bors: r=alexcrichton

@bors
Copy link
Collaborator

bors commented Nov 22, 2017

📌 Commit 4b0e75e has been approved by alexcrichton

@nrc nrc added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 22, 2017
@nrc
Copy link
Member Author

nrc commented Nov 23, 2017

@bors: r- I'm going to tag on an extra fix

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 23, 2017
@kennytm
Copy link
Member

kennytm commented Nov 25, 2017

@nrc #46145 has just been merged, is this one ready too?

@nrc nrc force-pushed the rls-update branch 2 times, most recently from 7e48380 to f6bb14d Compare November 26, 2017 23:15
@nrc
Copy link
Member Author

nrc commented Nov 26, 2017

@bors r=@alexcrichton, p=1 (need to get in before #44884 and fixes RLS, which is currently broken)

@bors
Copy link
Collaborator

bors commented Nov 26, 2017

📌 Commit f6bb14d has been approved by @alexcrichton,

@nrc nrc mentioned this pull request Nov 26, 2017
Merged
4 tasks
@bors
Copy link
Collaborator

bors commented Nov 27, 2017

⌛ Testing commit f6bb14da589e7a19a913a87e9ddedf5ef2facb48 with merge f68ddb8cecb95aba88d7f05a2eb4d94f2c806805...

@bors
Copy link
Collaborator

bors commented Nov 27, 2017

💔 Test failed - status-appveyor

bors added a commit that referenced this pull request Nov 27, 2017
@bors
Auto merge of #46144 - nrc:rls-update, r=@alexcrichton,
9e320ab 
Update RLS and Rustfmt

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Nov 27, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Nov 27, 2017

Cargo test failed 🤔

[01:08:29] failures:
[01:08:29] 
[01:08:29] ---- frozen_flag_preserves_old_lockfile stdout ----
[01:08:29] 	running `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/cargo build --locked`
[01:08:29] thread 'frozen_flag_preserves_old_lockfile' panicked at '
[01:08:29] Expected: execs
[01:08:29]     but: exited with exit code: 101
[01:08:29] --- stdout
[01:08:29] 
[01:08:29] --- stderr
[01:08:29]     Updating registry `file:///checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/cit/t1/registry`
[01:08:29] error: checksum for `foo v0.1.0` changed between lock files
[01:08:29] 
[01:08:29] this could be indicative of a few possible errors:
[01:08:29] 
[01:08:29]     * the lock file is corrupt
[01:08:29]     * a replacement source in use (e.g. a mirror) returned a different checksum
[01:08:29]     * the source itself may be corrupt in one way or another
[01:08:29] 
[01:08:29] unable to verify that `foo v0.1.0` is the same as when the lockfile was generated
[01:08:29] 
[01:08:29] ', /cargo/registry/src/github.heygears.com-1ecc6299db9ec823/hamcrest-0.1.1/src/core.rs:31:12
[01:08:29] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:08:29] 
[01:08:29] 
[01:08:29] failures:
[01:08:29]     frozen_flag_preserves_old_lockfile
[01:08:29] 
[01:08:29] test result: FAILED. 8 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
[01:08:29] 
[01:08:29] �[m�[m�[31m�[1merror:�[m test failed, to rerun pass '--test lockfile-compat'
[01:08:29] 
[01:08:29] 
[01:08:29] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml"

@bors
Copy link
Collaborator

bors commented Nov 27, 2017

☔ The latest upstream changes (presumably #44884) made this pull request unmergeable. Please resolve the merge conflicts.

@nrc nrc mentioned this pull request Nov 28, 2017
Closed
@nrc
Copy link
Member Author

nrc commented Nov 29, 2017

Rebased, updates Cargo to bring in the Cargo test fix, and re-enables RLS Rustfmt testing.

@bors: r=alexcrichton p=1

@bors
Copy link
Collaborator

bors commented Nov 29, 2017

📌 Commit 1cec22e has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Nov 29, 2017

⌛ Testing commit 1cec22e with merge 0d3557abadbeced6b8931a1259c272029670a506...

@bors
Copy link
Collaborator

bors commented Nov 29, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Nov 29, 2017

@bors retry — travis-ci/travis-ci#8821

@kennytm kennytm 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 29, 2017
@bors
Copy link
Collaborator

bors commented Nov 29, 2017

⌛ Testing commit 1cec22e with merge d6eddbedec89cfcfda2cb12870a730658176f6c7...

@bors
Copy link
Collaborator

bors commented Nov 29, 2017

💔 Test failed - status-appveyor

@nrc
Copy link
Member Author

nrc commented Nov 29, 2017

@bors: retry

@bors
Copy link
Collaborator

bors commented Nov 29, 2017

⌛ Testing commit 1cec22e with merge 74bc14d...

bors added a commit that referenced this pull request Nov 29, 2017
@bors
Auto merge of #46144 - nrc:rls-update, r=alexcrichton
74bc14d 
Update RLS and Rustfmt

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented Nov 30, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 74bc14d to master...

@bors bors merged commit 1cec22e into rust-lang:master Nov 30, 2017
This was referenced Nov 30, 2017
Merged
Closed
Merged
@arielb1 arielb1 mentioned this pull request Dec 21, 2017
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@nrc @alexcrichton @bors @kennytm