Closed
Description
Hello, this is your friendly neighborhood mergebot.
After merging PR #84310, I observed that the tool rustfmt no longer builds.
A follow-up PR to the repository https://github.com/rust-lang/rustfmt is needed to fix the fallout.
cc @RalfJung, do you think you would have time to do the follow-up work?
If so, that would be great!
Activity
RalfJung commentedon Apr 25, 2021
The fix should be to use the
const_fn_trait_bound
and/orconst_fn_unsize
feature gates instead ofconst_fn
. Let me know if/how I can help with that.RalfJung commentedon Apr 26, 2021
The latest version 716 of
rustc-ap-rustc_ast
is still too old, it does not yet use theconst_fn_unsize
feature gate... shouldn't new versions be published automatically?calebcartwright commentedon Apr 26, 2021
They get published weekly, on Tuesday
However, depending on how big an impact this round of updates has, we may end up resolving this with #82208 (convert to subtree and drop the AP crate dependencies)
RalfJung commentedon Apr 27, 2021
Oh, just once a week? Wow yeah that sounds like a high-friction workflow...
Looks like the updates are out. And looks like the build failures are all related to #82608 which changed many things in and around
TokenStream
-- Cc @Aaron1011The missing associated const is easy, but I am not good enough at type golf to figure out the other two problems.^^
(That PR landed more than 2 weeks ago, so I am quite surprised that rustfmt wasn't marked as broken already before that... looks like using these "ap" library copies leads to huge delays and a lot of pain. FWIW in Miri we instead use
rustup-toolchain-install-master
and link directly against the latest internal rustc libs, that at least means we get notified immediately when a PR changes APIs that we use which makes fixing things a lot easier. But using subtrees sounds even better. :D )Aaron1011 commentedon Apr 27, 2021
I've opened rust-lang/rustfmt#4817 to fix the rustfmt breakage
calebcartwright commentedon Apr 28, 2021
Yeah it's a real time sink to say the least 🙃
That's great to hear. It sounds like a much better approach for working on tools, and I'm super excited that we're finally moving rustfmt to this model. I think the additional change to a subtree will help us out a lot too, but even on the off chance we end up going back to a submodule, not being constrained by the auto publish crates is going to be tremendously helpful!
RalfJung commentedon Apr 28, 2021
Agreed. :) If you have any questions about how we're solving some specific issue that comes up in Miri, feel free to ping me any time. :) (But we haven't moved to subtrees yet with Miri, so for subtree-specific questions, the clippy people would probably be the right people to ask. When clippy moved from submodule to subtree, it took a few weeks to iron out the kinks and get all the tooling around tools right again, I hope that will be easier this time.^^)
RalfJung commentedon Apr 29, 2021
rust-lang/rustfmt#4817 landed, what's next? Does just updating the submodule work, or is there more work required?
calebcartwright commentedon Apr 30, 2021
We typically have to first update racer, ensure we've got a release or branch in the rustfmt repo for RLS, and then update RLS before the submodules can be updated here. It's a fun dance.
Those are other pieces are in flight already and will post updates here as they move along
calebcartwright commentedon Apr 30, 2021
Actually it looks like we could need another round of updates for the auto publish crates. I think this may have some correlation to the items discussed/addressed in #84614 as the compile errors I'm seeing now using 2021-04-29 are related to
const_fn_trait_bound
on lock_api, which gets pulled in to the dep trees of both racer and rustfmt via the auto published version of rustc_data_structures (the latest of which is from Tuesday).17 remaining items