Convert rustfmt from a submodule to a subtree #82208
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nt-prefix add static support for raw prefix identifiers
…e previous commit. The previous commit could be part of the current PR.
calebcartwright
force-pushed
the
rustfmt-subtree
branch
from
e677516
to
34368ec
Compare
|
Going to temporarily close this - it seems to be causing some trouble on bors, which is stalling out builds for other PRs. I will reopen and investigate in more detail tomorrow, but don't want to stall the queue overnight (for me). |
|
Let's see if we can reopen now without harm. Also to be sure: |
|
Can this be r+'d again? Looks like the merge conflict was resolved? |
|
We can try. @bors r+ rollup=never |
|
📌 Commit 34368ec has been approved by |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced May 15, 2021
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 17, 2021
Update RLS Contains rust-lang/rls#1736. With rust-lang#82208 merged, this should now close rust-lang#85225. Tested locally with `./x.py test src/tools/rls` and seems to be working as expected. I noticed the rustfmt merge didn't trigger toolstate upgrade (because we pruned most but not all of the related machinery?), so I'd rather get this rubber-stamped by someone more knowledgeable with infra/the merged changes in case I missed something and need to include something else here to unbreak the RLS toolstate. r? `@Mark-Simulacrum`
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
Jun 8, 2021
Remove rustfmt tests from top-level .gitattributes These are tracked in src/tools/rustfmt/.gitattributes already, they don't need to be listed twice. r? `@ehuss` since you suggested adding them in rust-lang#82208; I think it should be ok now that bors isn't trying to merge the `subtree add` changes. cc `@calebcartwright`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @calebcartwright cc @Manishearth @Mark-Simulacrum
The motivation is that submodule updates cause rustfmt to not be available on nightly a lot; most recently it was unavailable for over 10 days, causing the beta release to be delayed. Additionally this is much less work on the part of the rustfmt maintainers to keep the rustfmt compiling, since now people making breaking changes will be responsible for fixing them.
I kept the rustfmt git history so it looks like there are thousands of commits. The important commits are https://github.com/rust-lang/rust/compare/851dee3af9404bf399c3c4ffefe5105edb3debad~..pull/82208/head. This adds about 10 MB of git history, which is not terribly much compared to the 702 MB that already exist.
Add
src/tools/rustfmttox.py checkFix CRLF issues with rustfmt tests (see commit for details)
Use
rustc_privateinstead of crates.io dependenciesThis was already switched upstream and would have landed in the next submodule bump anyway. This just updates Cargo.lock for rust-lang/rust.
Add
yansi-termto the list of allowed dependencies.This is a false positive - rustc doesn't actually use it, only rustfmt, but because it's activated by the cargo feature of a dependency, tidy gets confused. It's fairly innocuous in any case, it's used for color printing.
This would have happened in the next submodule bump.
Remove rustfmt from the list of toolstate tools.
Give a hard error if testing or building rustfmt fails.
Update log to 0.4.14
This avoids a warning about semicolons in macros; see the commit for details.
Don't add tools to the sysroot when they finish building.
This is the only change that could be considered a regression - this avoids a "colliding StableCrateId" error due to a bug in resolve (creader: Host crate loaded twice produces different
CrateNums if host != target #56935). The regression is that this rebuilds dependencies more often than strictly necessary. See the commit for details.Fixes #85226 (permanently). Closes #82385. Helps with #70651. Helps with #80639.