-
Notifications
You must be signed in to change notification settings - Fork 13.7k
clean up some old const trait impl syntax #146071
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
base: master
Are you sure you want to change the base?
Conversation
r? @ibraheemdev rustbot has assigned @ibraheemdev. Use |
rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead. cc @rust-lang/rust-analyzer Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter |
This comment has been minimized.
This comment has been minimized.
I think these two lines need to be flipped in rust/src/tools/rustfmt/src/items.rs Lines 1178 to 1179 in 828e45a
Also, I think the tidy checks use bootstrap~~/beta~~ rustfmt, not in-tree rustfmt, so fixing |
We use a pinned nightly for rustfmt, so landing a rustfmt change and updating rustfmt the next day should work. |
It seems that this: rust/src/tools/rustfmt/src/items.rs Lines 1176 to 1182 in 84a1747
Conflicts with: |
Some changes occurred in src/tools/rustfmt cc @rust-lang/rustfmt |
This comment has been minimized.
This comment has been minimized.
fix a constness ordering bug in rustfmt Normally, changes to rustfmt go into the separate repo. But, in this case, the bug is introduced in a local change and therefore isn't present in the rustfmt repo. Related to: rust-lang#146071 Fixes rust-lang/rustfmt#6619.
fix a constness ordering bug in rustfmt Normally, changes to rustfmt go into the separate repo. But, in this case, the bug is introduced in a local change and therefore isn't present in the rustfmt repo. Related to: rust-lang#146071 Fixes rust-lang/rustfmt#6619.
fix a constness ordering bug in rustfmt Normally, changes to rustfmt go into the separate repo. But, in this case, the bug is introduced in a local change and therefore isn't present in the rustfmt repo. Related to: rust-lang#146071 Fixes rust-lang/rustfmt#6619.
Rollup merge of #146089 - npmccallum:rustfmt, r=fmease fix a constness ordering bug in rustfmt Normally, changes to rustfmt go into the separate repo. But, in this case, the bug is introduced in a local change and therefore isn't present in the rustfmt repo. Related to: #146071 Fixes rust-lang/rustfmt#6619.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
☔ The latest upstream changes (presumably #146160) made this pull request unmergeable. Please resolve the merge conflicts. |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
The job Click to see the possible cause of the failure (guessed by this bot)
|
@bjorn3 The tidy test is still failing, even after my fix for rustfmt was merged. What do we need to do? Do we have to pin tidy to a different nightly? I don't know how this works. |
Yea we need to repin explicitly, lemme investigate how that works. However, I'm not sure if we even pin to some nightly rustfmt, I thought we pin to a beta rustfmt but I'm probably wrong. |
Related to: #143874