Skip to content
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

Remove rustfmt tests from top-level .gitattributes #85989

Merged
merged 1 commit into from
Jun 8, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jun 4, 2021

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 #82208; I think it should be ok now that bors isn't trying to merge the subtree add changes.

cc @calebcartwright

These are tracked in src/tools/rustfmt/.gitattributes already, they
don't need to be listed twice.
@jyn514 jyn514 added the C-cleanup Category: PRs that clean code up or issues documenting cleanup. label Jun 4, 2021
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 4, 2021
@calebcartwright
Copy link
Member

if bors remains happy without this then i'm happy 😄

@ehuss
Copy link
Contributor

ehuss commented Jun 8, 2021

Thanks! I'm not 100% confident in how subtrees work, but testing a merge locally seemed to be ok.

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 8, 2021

📌 Commit c6004a5 has been approved by ehuss

@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 Jun 8, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 8, 2021
Rollup of 11 pull requests

Successful merges:

 - rust-lang#85906 (Use `Iterator::find` instead of open-coding it)
 - rust-lang#85951 (Update the documentation of `-C force-unwind-tables` for rust-lang#83482)
 - rust-lang#85985 (Clarify documentation of slice sorting methods)
 - rust-lang#85989 (Remove rustfmt tests from top-level .gitattributes)
 - rust-lang#86074 (Default panic message should print Box<dyn Any>)
 - rust-lang#86078 (Type page font weight)
 - rust-lang#86090 (:arrow_up: rust-analyzer)
 - rust-lang#86095 (Search description codeblock)
 - rust-lang#86096 (Comment out unused error codes and add description for E0316)
 - rust-lang#86101 (Correct type signature in doc for Bound::as_mut)
 - rust-lang#86103 (Remove lifetime hack)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c302810 into rust-lang:master Jun 8, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 8, 2021
@jyn514 jyn514 deleted the gitignore-cleanup branch June 8, 2021 11:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants