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 and drop rustc-ap-packages #92935

Merged
merged 3 commits into from
Jan 17, 2022
Merged

Update RLS and drop rustc-ap-packages #92935

merged 3 commits into from
Jan 17, 2022

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Jan 15, 2022

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 15, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jan 16, 2022

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

@pietroalbini
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jan 16, 2022

📌 Commit 69c3b72 has been approved by pietroalbini

@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 Jan 16, 2022
@Xanewok
Copy link
Member Author

Xanewok commented Jan 16, 2022

Let's get this quicker due to submodule/lockfile update

@bors p=1

@bors
Copy link
Contributor

bors commented Jan 16, 2022

⌛ Testing commit 69c3b72 with merge 1fbd6ae...

@bors
Copy link
Contributor

bors commented Jan 17, 2022

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing 1fbd6ae to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 17, 2022
@bors bors merged commit 1fbd6ae into rust-lang:master Jan 17, 2022
@rustbot rustbot added this to the 1.60.0 milestone Jan 17, 2022
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #92935!

Tested on commit 1fbd6ae.
Direct link to PR: #92935

🎉 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 Jan 17, 2022
@rust-highfive
📣 Toolstate changed by rust-lang/rust#92935!
99aa060 
Tested on commit rust-lang/rust@1fbd6ae.
Direct link to PR: <rust-lang/rust#92935>

🎉 rls on windows: build-fail → test-pass (cc @Xanewok).
🎉 rls on linux: build-fail → test-pass (cc @Xanewok).
@Xanewok Xanewok deleted the update-rls branch January 17, 2022 02:44
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1fbd6ae): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

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.60.0
Development

Successfully merging this pull request may close these issues.

rls no longer builds after rust-lang/rust#91539
7 participants
@Xanewok @rust-highfive @rust-log-analyzer @bors @pietroalbini @rust-timer @rustbot