-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
[beta] backports #81151
[beta] backports #81151
Conversation
@bors r+ rollup=never |
📌 Commit a1edcfbcf55c4aabd67af980370cf6448fcba5b2 has been approved by |
The job Click to see the possible cause of the failure (guessed by this bot)
|
@bors r- @Xanewok @calebcartwright it looks like the ap crates are relying on const generics to be stable, but the backports of recent bumps push them back to 1.50 where const generics are not yet stable. This has a number of implications:
we'll need to resolve this before we can land this, but if it takes more than a few days I'll probably drop those updates from this PR |
Might take some juggling but perhaps as an alternative I could backport the commits for the bug fix to the rustfmt-1.4.30 branch in the rustfmt repo. Then rustfmt submod here on beta could stay on the 1.4.30 branch and just pull in the commit, and then do something similar on the RLS maybe in a new branch off whatever's currently in beta? |
That sounds like a good strategy to me. |
Done on the rustfmt side. @Xanewok - let me know if I can do anything to help on the RLS side. Based on what's currently on beta I'm guessing/hoping it's just a matter of bumping the 1.4.29 rustfmt dependency currently in the submod to the now-updated 1.4.30 branch, but not sure if there's anything else on the RLS side that needed to be backported as well |
Created a https://github.com/rust-lang/rls/tree/rust-1.50 (updates a single commit, starting from https://github.com/rust-lang/rls/tree/2cf84baa5e3c55ac02f42919e67440acb5417125, currently checked out as part of the |
[beta] update RLS and rustfmt with backported rustfmt fix Refs rust-lang#81151 (comment) r? `@Mark-Simulacrum` cc `@Xanewok`
☔ The latest upstream changes (presumably #81201) made this pull request unmergeable. Please resolve the merge conflicts. |
Files in the temporary directory are used by ./x.py install.
The struct will allow to store more context on the generated tarballs.
Co-authored-by: Joshua Nelson <jyn514@gmail.com>
Co-authored-by: Joshua Nelson <jyn514@gmail.com>
a1edcfb
to
d239ea6
Compare
@bors r+ rollup=never |
📌 Commit d239ea6 has been approved by |
☀️ Test successful - checks-actions |
This backports:
r? @ghost