Skip to content

stop x fmt formatting untracked directories #110664

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

Merged
merged 1 commit into from
Apr 24, 2023

Conversation

Ezrashaw
Copy link
Contributor

I don't think there's anything else to do? I've confirmed that you get a "skip untracked path foo/ during rustfmt invocations" for the alternative build directory.

r? @jyn514

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 22, 2023
Copy link
Member

@jyn514 jyn514 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me with or without the nit

Comment on lines 147 to +149
.filter(|entry| entry.starts_with("??"))
.filter_map(|entry| {
let path =
entry.split(' ').nth(1).expect("every git status entry should list a path");
path.ends_with(".rs").then_some(path)
.map(|entry| {
entry.split(' ').nth(1).expect("every git status entry should list a path")
Copy link
Member

@jyn514 jyn514 Apr 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can simplify this slightly:

                .filter_map(|entry| entry.strip_prefix("?? "))

(and remove .filter above)

@jyn514
Copy link
Member

jyn514 commented Apr 22, 2023

@bors delegate=Ezrashaw rollup

@bors
Copy link
Collaborator

bors commented Apr 22, 2023

✌️ @Ezrashaw can now approve this pull request

@jyn514 jyn514 changed the title stop x fmt formatting alt build dirs stop x fmt formatting untracked directories Apr 22, 2023
@Ezrashaw
Copy link
Contributor Author

Personally I think it's looks cleaner as is but that's just me.

@bors r+

(ooh the power)

@bors
Copy link
Collaborator

bors commented Apr 22, 2023

📌 Commit e9c52a5 has been approved by Ezrashaw

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 22, 2023
@jyn514
Copy link
Member

jyn514 commented Apr 22, 2023

@bors r- r=jyn514

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 22, 2023
@bors
Copy link
Collaborator

bors commented Apr 22, 2023

📌 Commit e9c52a5 has been approved by jyn514

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 22, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 22, 2023
…t, r=jyn514

stop `x fmt` formatting untracked directories

I don't think there's anything else to do? I've confirmed that you get a "skip untracked path foo/ during rustfmt invocations" for the alternative build directory.

r? `@jyn514`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 22, 2023
…t, r=jyn514

stop `x fmt` formatting untracked directories

I don't think there's anything else to do? I've confirmed that you get a "skip untracked path foo/ during rustfmt invocations" for the alternative build directory.

r? ``@jyn514``
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Apr 22, 2023
…t, r=jyn514

stop `x fmt` formatting untracked directories

I don't think there's anything else to do? I've confirmed that you get a "skip untracked path foo/ during rustfmt invocations" for the alternative build directory.

r? ```@jyn514```
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 24, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#110661 (rustdoc: clean up settings.css and settings.js)
 - rust-lang#110663 (Add note about change in bootstrap defaults)
 - rust-lang#110664 (stop `x fmt` formatting untracked directories)
 - rust-lang#110668 (Fix printing native CPU on cross-compiled compiler.)
 - rust-lang#110689 (Fix grammar in core::hint::unreachable_unchecked() docs)
 - rust-lang#110700 (Don't infer fn return type to return itself)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit a557ed0 into rust-lang:master Apr 24, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 24, 2023
@Ezrashaw Ezrashaw deleted the fix-bootstrap-build-format branch April 26, 2023 09:03
@Ezrashaw Ezrashaw restored the fix-bootstrap-build-format branch May 3, 2024 08:11
@Ezrashaw Ezrashaw deleted the fix-bootstrap-build-format branch May 13, 2024 10:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants