Skip to content

Ignore files in .gitignore in mir opt check#109323

Merged
bors merged 1 commit intorust-lang:masterfrom
joboet:ignore_ds_store_tidy
Mar 20, 2023
Merged

Ignore files in .gitignore in mir opt check#109323
bors merged 1 commit intorust-lang:masterfrom
joboet:ignore_ds_store_tidy

Conversation

@joboet
Copy link
Member

@joboet joboet commented Mar 18, 2023 •
edited
Loading

This caused ./x test tidy to fail for me when Finder (macOS) added .DS_Store files. They are ignored by git, so tidy should ignore them, too.

@rustbot
Copy link
Collaborator

rustbot commented Mar 18, 2023

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 18, 2023
@albertlarsan68
Copy link
Member

albertlarsan68 commented Mar 18, 2023

I think there is a PR to ignore all files in .gitignore

@joboet
Copy link
Member Author

joboet commented Mar 18, 2023

Do you mean #106440? That unfortunately did not adjust the mir-opt check. This PR is just a cheap fix to get git push to work without having to delete the files all the time. Reimplementing the check using walk_no_read is probably the better solution, I'll see if I can do that.

@onur-ozkan
Copy link
Contributor

onur-ozkan commented Mar 18, 2023

It looks pretty hacky that writing those files as hardcoded seperately from .gitignore. Which will cost maintaining multiple places for ignored files. And it will be worst and worst when we need to ignore more files. Can't we make it work with .gitignore?

@joboet joboet force-pushed the ignore_ds_store_tidy branch from f63b46e to c00bdfb Compare March 18, 2023 23:00
@joboet joboet changed the title Ignore .DS_Store in mir-opt tidy check Ignore files in .gitignore in mir opt check Mar 18, 2023
@joboet
Copy link
Member Author

joboet commented Mar 18, 2023

I've rewritten this to use walk_no_read, so all files in .gitignore are now skipped.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@joboet joboet force-pushed the ignore_ds_store_tidy branch from c00bdfb to 500ad26 Compare March 19, 2023 11:53
@joboet
Copy link
Member Author

joboet commented Mar 19, 2023

Rebased to include #108772, which changed walk_no_read.

onur-ozkan
onur-ozkan approved these changes Mar 19, 2023
View reviewed changes
Copy link
Contributor

@onur-ozkan onur-ozkan left a comment •
edited
Loading

Choose a reason for hiding this comment

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

thanks for the fix!

@onur-ozkan
Copy link
Contributor

onur-ozkan commented Mar 19, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 19, 2023

📌 Commit 500ad26 has been approved by ozkanonur

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 Mar 19, 2023
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 20, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 20, 2023
@bors
Auto merge of rust-lang#109376 - matthiaskrgr:rollup-0aut57k, r=matth…
e91364b 
…iaskrgr

Rollup of 13 pull requests

Successful merges:

 - rust-lang#109249 (Update names/comments for new return-position impl trait in trait lowering strategy)
 - rust-lang#109259 (rustdoc: Fix missing private inlining)
 - rust-lang#109269 (rustdoc: cleanup some intermediate allocs)
 - rust-lang#109301 (fix: fix ICE in `custom-test-frameworks` feature)
 - rust-lang#109319 (Add test for `c_variadic` in rustdoc-json)
 - rust-lang#109323 (Ignore files in .gitignore in mir opt check)
 - rust-lang#109331 (rustdoc: implement bag semantics for function parameter search)
 - rust-lang#109337 (Improve `Iterator::collect_into` documentation)
 - rust-lang#109351 (rustdoc: Remove footnote references from doc summary)
 - rust-lang#109353 (Fix wrong crate name in custom MIR docs)
 - rust-lang#109362 (Split `items` from `-Zmeta-stats` in two.)
 - rust-lang#109370 (fix ClashingExternDeclarations lint ICE)
 - rust-lang#109375 (rustdoc: Fix improper escaping of deprecation reasons)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4f61ce2 into rust-lang:master Mar 20, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 20, 2023
@joboet joboet deleted the ignore_ds_store_tidy branch March 20, 2023 08:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@onur-ozkan onur-ozkan onur-ozkan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@onur-ozkan onur-ozkan

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.70.0

Development

Successfully merging this pull request may close these issues.

6 participants

@joboet @rustbot @albertlarsan68 @onur-ozkan @rust-log-analyzer @bors