-
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
Fix missing rustfmt in msi installer #101993 #131365
Conversation
rustbot has assigned @Mark-Simulacrum. Use |
These commits modify the If this was unintentional then you should revert the changes before this PR is merged. This PR modifies If appropriate, please update |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
9758acb
to
a119803
Compare
r=me on the first two commits with direct fixes. The refactoring commit is rather large and I'd prefer to see it split into a separate PR and/or have some discussion on Zulip first -- I'm not really following how reusing PkgType significantly helps avoid problems... it seems like a small part of the puzzle at best. |
@Mark-Simulacrum thanks! one of the benefits for the refactor commit is to keep the tool attributes (eg That said, I agree the refactor commit is a bit more involved and happy to open another PR for it. I could also revert the change to build-manifest and declare another enum for internal usage within build step. |
There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged. You can start a rebase with the following commands:
The following commits are merge commits: |
d42d9f3
to
196849b
Compare
196849b
to
2316749
Compare
@bors r+ |
Maybe? I think de-duplicating constants probably makes sense, but my recollection (maybe incorrect) was that the refactoring did more than that. In any case, happy to see a separate PR and/or some Zulip discussion of the particulars. |
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#121560 (Allow `#[deny]` inside `#[forbid]` as a no-op) - rust-lang#131365 (Fix missing rustfmt in msi installer rust-lang#101993) - rust-lang#131647 (Register `src/tools/unicode-table-generator` as a runnable tool) - rust-lang#131843 (compiler: Error on layout of enums with invalid reprs) - rust-lang#131926 (Align boolean option descriptions in `configure.py`) - rust-lang#131961 (compiletest: tidy up how `tidy` and `tidy` (html version) are disambiguated) - rust-lang#131962 (Make `llvm::set_section` take a `&CStr`) - rust-lang#131964 (add latest crash tests) - rust-lang#131965 (remove outdated comment) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#131365 - heiseish:fix-issue-101993, r=Mark-Simulacrum Fix missing rustfmt in msi installer rust-lang#101993 # Context - Fixed missing `rustfmt`, `clippy`, `miri` and `rust-analyzer` in msi installer - Fixed missing `rustfmt` for apple darwin installer - Closes rust-lang#101993 r? `@jyn514` - Please let me know if I should request from someone else instead. I divided the changes into 3 separate commits for the ease of review. The refactoring commit `fbdfd5c03c3c979bcf105ccdd05ff4ab9f37a763` is a bit more involved, but I think it helps in the long term for readability and to avoid bugs. - I changed `build-manifest` to `build_manifest` in order to invoke it as a library. Not sure if this is gonna break any upstream processes. I checked `generate-manifest-list` and `generate-release` but didn't find any obvious reference - Will push fixes for linting later
Context
rustfmt
,clippy
,miri
andrust-analyzer
in msi installerrustfmt
for apple darwin installerr? @jyn514
fbdfd5c03c3c979bcf105ccdd05ff4ab9f37a763
is a bit more involved, but I think it helps in the long term for readability and to avoid bugs.build-manifest
tobuild_manifest
in order to invoke it as a library. Not sure if this is gonna break any upstream processes. I checkedgenerate-manifest-list
andgenerate-release
but didn't find any obvious reference