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.

Sign up for GitHub

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

Jump to bottom

Update RLS #77847

Merged
merged 1 commit into from
Oct 12, 2020
Merged

Update RLS #77847

merged 1 commit into from
Oct 12, 2020

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Oct 12, 2020

cc #77819
Fixes #77810

r? @ghost

@Xanewok Xanewok added the A-rls label Oct 12, 2020
@Xanewok
Copy link
Member Author

Xanewok commented Oct 12, 2020

@mati865 @Mark-Simulacrum I don't think this should be beta-nominated, right? If we bumped crossbeam in #77819 then I imagine this also affects the version pulled by RLS in the workspace context there and should suffice

@Xanewok
Copy link
Member Author

Xanewok commented Oct 12, 2020

Let's land this in the meantime

@bors r? @Xanewok r+ p=1 (fixes toolstate)

@Xanewok
Copy link
Member Author

Xanewok commented Oct 12, 2020

bors r? @Xanewok r+ p=1 (fixes toolstate)

maybe that's too many options at once :(

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Oct 12, 2020

📌 Commit 1852392 has been approved by Xanewok

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 12, 2020
@mati865
Copy link
Contributor

mati865 commented Oct 12, 2020

bors r? @Xanewok r+ p=1 (fixes toolstate)

maybe that's too many options at once :(

This would be correct syntax but I have no idea if it works: r? @Xanewok @bors r+ p=1 (fixes toolstate)

I don't think this should be beta-nominated, right?

I don't think so but it's up to @Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Oct 12, 2020

@mati865: 🔑 Insufficient privileges: Not in reviewers

@bors
Copy link
Contributor

bors commented Oct 12, 2020

@mati865: 🔑 Insufficient privileges: not in try users

@bors
Copy link
Contributor

bors commented Oct 12, 2020

⌛ Testing commit 1852392 with merge 4ae6bedc0535ccb1fe43e2b4af241b77f1af1191...

@rust-log-analyzer
Copy link
Collaborator

The job mingw-check of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log. 
Build completed successfully in 0:02:05
+ /scripts/validate-toolstate.sh
Cloning into 'rust-toolstate'...
<Nothing changed>
error: rustc-dev-guide maintainer @mark-i-m is not assignable in the rust-lang/rust repo

  To be assignable, a person needs to be explicitly listed as a
  collaborator in the repository settings. The simple way to
  fix this is to ask someone with 'admin' privileges on the repo
  to add the person or whole team as a collaborator with 'read'
  privileges. Those privileges don't grant any extra permissions
  so it's safe to apply them.
The build will fail due to this.
== clock drift check ==
  local time: Mon Oct 12 18:22:51 UTC 2020
  network time: Mon, 12 Oct 2020 18:22:51 GMT
  network time: Mon, 12 Oct 2020 18:22:51 GMT
== end clock drift check ==
##[error]Process completed with exit code 1.
Terminate orphan process: pid (3400) (node)
Terminate orphan process: pid (3409) (python)

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

@JohnTitor
Copy link
Member

@bors retry yielding

@bors
Copy link
Contributor

bors commented Oct 12, 2020

⌛ Testing commit 1852392 with merge 8dae8cd...

@bors
Copy link
Contributor

bors commented Oct 12, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Xanewok
Pushing 8dae8cd to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 12, 2020
@bors bors merged commit 8dae8cd into rust-lang:master Oct 12, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 12, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #77847!

Tested on commit 8dae8cd.
Direct link to PR: #77847

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 12, 2020
@rust-highfive
📣 Toolstate changed by rust-lang/rust#77847!
67e11a4 
Tested on commit rust-lang/rust@8dae8cd.
Direct link to PR: <rust-lang/rust#77847>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Xanewok Xanewok

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.49.0
Development

Successfully merging this pull request may close these issues.

rls no longer builds after rust-lang/rust#77649
7 participants
@Xanewok @bors @mati865 @rust-log-analyzer @JohnTitor @rust-highfive @rustbot