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

Prepare beta 1.51.0 #81921

Merged
merged 8 commits into from
Feb 11, 2021
Merged

Prepare beta 1.51.0 #81921

merged 8 commits into from
Feb 11, 2021

Conversation

pietroalbini
Copy link
Member

cc @rust-lang/release
r? @ghost

@pietroalbini
Copy link
Member Author

@bors r+ p=1000 rollup=never

@bors
Copy link
Contributor

bors commented Feb 9, 2021

📌 Commit bae1a0a has been approved by pietroalbini

@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 Feb 9, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@pietroalbini
Copy link
Member Author

@bors r-

@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 Feb 9, 2021
@pietroalbini
Copy link
Member Author

@bors r+ p=1000 rollup=never

@bors
Copy link
Contributor

bors commented Feb 9, 2021

📌 Commit 4745585 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 9, 2021
@bors
Copy link
Contributor

bors commented Feb 9, 2021

⌛ Testing commit 4745585 with merge 1dddb472b0e764de5d2029560576f36a5b706cb9...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@pietroalbini
Copy link
Member Author

Also needed to cherry-pick 483c1a8 to make the build work. Will send a PR landing that commit on master in a bit.

@bors r+ p=1000 rollup=never

@bors
Copy link
Contributor

bors commented Feb 9, 2021

📌 Commit e708e2a has been approved by pietroalbini

@bors
Copy link
Contributor

bors commented Feb 9, 2021

⌛ Testing commit e708e2a with merge 30b51f4208197b622efafc707a28c08007f2cb37...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 9, 2021

💔 Test failed - checks-actions

@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 Feb 9, 2021
@pietroalbini
Copy link
Member Author

Seems like rustfmt depends on an old version of rustc-ap-rustc_arena, which used the now-removed array_value_iter feature.

@Mark-Simulacrum
Copy link
Member

Hm. cc @calebcartwright

It looks like we'll probably want to either bump rustfmt or do some other fix, not really sure...

@ollie27
Copy link
Member

ollie27 commented Feb 9, 2021

Did you intend to apply this PR to the master branch?

@pietroalbini pietroalbini changed the base branch from master to beta February 9, 2021 16:38
@bors
Copy link
Contributor

bors commented Feb 9, 2021

⚠️ The base branch changed to beta, and the PR will need to be re-approved.

@Xanewok
Copy link
Member

Xanewok commented Feb 10, 2021

#81768 has been merged and RLS/Rustfmt toolstate is green now.

@pietroalbini
Copy link
Member Author

Thanks! Cherry-picked the following two PRs:

@bors r+ p=500 rollup=never

@bors
Copy link
Contributor

bors commented Feb 10, 2021

📌 Commit 9e98dfe 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 10, 2021
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@pietroalbini
Copy link
Member Author

@bors r+ p=500 rollup=never

@bors
Copy link
Contributor

bors commented Feb 10, 2021

📌 Commit e15d61c has been approved by pietroalbini

@bors
Copy link
Contributor

bors commented Feb 10, 2021

⌛ Testing commit e15d61c with merge db5d098b874fab52e044fca0b96644bef0503c3a...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 10, 2021

💔 Test failed - checks-actions

@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 Feb 10, 2021
@Xanewok
Copy link
Member

Xanewok commented Feb 10, 2021

This is an instance of #79132 (comment), which probably needs a 7477867 backport for now.

I'm sorry that RLS doesn't build on aarch64-pc-windows-msvc proper - this was somehow alleviated by rust-lang/rls#1713 but not completely fixed - we ideally would upgrade to Tokio 1.0 (along with core jsonrpc-* deps) but that's not possible due to parity-tokio-ipc being blocked on paritytech/parity-tokio-ipc#30 (which is effectively blocked on Tokio design work in tokio-rs/tokio#3118).

However, I believe the RLS should build (but not pass tests, as these unconditionally require Tokio) with --no-default-features: this disables (only) ipc feature, which allows RLS to spawn rustc as child processes rather than executing them all in-process. This offers considerable benefits when checking wide (package-wise) workspaces but ultimately is an optimization and should work correctly without it.

We might:

  1. Try distributing RLS with --no-default-features on aarch64-pc-windows-msvc for the time being (without blocking the CI on RLS tests)
  2. Backport the hack from 7477867 and wait for the Tokio named pipes design work to conclude in the meantime
  3. Quickly write a hacky blocking IPC (sans Tokio) solution for named pipes, which I unfortunately don't have time for in the next couple of days

Solution no. 2 seems easiest and is proven to work (#79132) but if we try going with solution no. 1, if we don't need to hack dist.rs much, then we might end up with working RLS for the aarch64-pc-windows-msvc target until we fix the ipc feature there.

@pietroalbini
Copy link
Member Author

Backported 7477867.

@bors r+ p=500 rollup=never

@bors
Copy link
Contributor

bors commented Feb 11, 2021

📌 Commit b2d3220 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 Feb 11, 2021
@bors
Copy link
Contributor

bors commented Feb 11, 2021

⌛ Testing commit b2d3220 with merge a5a775e...

@bors
Copy link
Contributor

bors commented Feb 11, 2021

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing a5a775e to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 11, 2021
@bors bors merged commit a5a775e into rust-lang:beta Feb 11, 2021
@rustbot rustbot added this to the 1.51.0 milestone Feb 11, 2021
@pietroalbini pietroalbini deleted the beta-next branch February 12, 2021 12:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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.51.0
Development

Successfully merging this pull request may close these issues.
9 participants
@pietroalbini @bors @rust-log-analyzer @Mark-Simulacrum @ollie27 @calebcartwright @Xanewok @rustbot @dtolnay