-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Make clippy a subrepo #70650
Make clippy a subrepo #70650
Conversation
…src/tools/clippy subrepo: subdir: "src/tools/clippy" merged: "c211cea3e99" upstream: origin: "https://github.com/rust-lang/rust-clippy.git" branch: "auto" commit: "c211cea3e99" git-subrepo: version: "0.4.1" origin: "???" commit: "???"
CONTRIBUTING.md
Outdated
happened to the copy in this repo and creates commits on the remote repo that match the local | ||
changes (so ever local commit that touched the subrepo causes a commit on the remote repo). Again, | ||
Even this `push` operation creates a commit in this repo that you need to get merged without | ||
rebasing. This is very important in order to make future synchronizations work. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So the idea is, I will git subrepo push
, and then make a rustc PR (likely self-r+ p=1) and a tool PR? And then what, I wait until the rustc PR lands before landing the tool PR, or vice versa? Either way there is a chance of conflicts where one PR lands and the other one does not, and it is unclear how bad that is. We should give some general guidance to at least have a consistent process.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have no experience here. Not sure how to build guidance without really knowing how it will behave in practice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Come up with a best guess, adjust it later if it doesn't work? ;)
CONTRIBUTING.md
Outdated
monorepo, so no one but you (or others that synchronize subrepos) needs to have `git subrepo` | ||
installed. | ||
|
||
#### Synchronizing a subrepo |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This, too, is something that contributors usually shouldn't have to do, instead that would generally be tool maintainer's job?
Is there a way for us maintainers to be notified when our tools change in rustc so that we know we need to sync? (Longer-term, having a bot to also do the syncing would be even better of course. But some kind of notification is required, I think, to avoid silent divergence.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Contributors shouldn't care about this entire section. Where else do I put it?
We could probably extend the toolstate bot to check whether git diff src/tools/clippy
has any output, and in that case ping the team
missing_tool("cargo clippy", builder.build.config.missing_tools); | ||
None | ||
})?; | ||
.expect("clippy expected to build - essential tool"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The config.toml.example
still lists clippy in the tool
list and as an example of an "extended tool". Is that outdated now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
kinda, you can still turn it off to not include it in the dist
Checklist:
Reassigning to r? @Mark-Simulacrum since they are more familiar with this infra and cc @pietroalbini |
Closing because there is more discussion to be had on the issue and this PR will regress soon anyway |
Just keep that contribution guide somewhere please, now that we edited it a bit. :) |
The job Click to expand the log.
I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
r? @Centril
Please keep all general subrepo discussion in #70651 to keep everyone's mentions clean from any kind of bors activity that we may have here.